diff options
author | Unit 193 <unit193@ubuntu.com> | 2015-05-29 15:12:17 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2015-05-29 15:12:17 -0400 |
commit | d925b68952cb030bf4931ee9c4ad56e5d619edaa (patch) | |
tree | 70673ccb6af508131ebedb5e1f335f11ebf60018 | |
parent | 27585270c72977fc0e7e0b3bf6e14e492e6d7209 (diff) | |
download | xebian-lb-config-d925b68952cb030bf4931ee9c4ad56e5d619edaa.tar.bz2 xebian-lb-config-d925b68952cb030bf4931ee9c4ad56e5d619edaa.tar.xz xebian-lb-config-d925b68952cb030bf4931ee9c4ad56e5d619edaa.tar.zst |
Move all live-boot args to live.conf
-rwxr-xr-x | auto/config | 2 | ||||
-rwxr-xr-x | config/hooks/persistence-menu.binary | 4 | ||||
-rw-r--r-- | config/includes.binary/boot/grub/loopback.cfg | 8 | ||||
-rw-r--r-- | config/includes.chroot/etc/live/config.conf | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/auto/config b/auto/config index 1531928..fe5f014 100755 --- a/auto/config +++ b/auto/config @@ -75,6 +75,6 @@ lb config noauto \ --iso-publisher "Unit 193" \ --iso-volume "Xebian Live" \ --linux-packages linux-image \ - --bootappend-live "boot=live nocomponents=xfce4-panel username=xebian hostname=xebian" \ + --bootappend-live "boot=live" \ $lb_opts \ "$@" diff --git a/config/hooks/persistence-menu.binary b/config/hooks/persistence-menu.binary index 457b4f9..6cc69c9 100755 --- a/config/hooks/persistence-menu.binary +++ b/config/hooks/persistence-menu.binary @@ -6,13 +6,13 @@ label live-persistence menu label ^Live USB Persistence (check kali.org/prst) linux /live/vmlinuz initrd /live/initrd.img - append boot=live nocomponents=xfce4-panel username=xebian hostname=xebian persistence + append boot=live persistence label live-encrypted-persistence menu label ^Live USB Encrypted Persistence (check kali.org/prst) linux /live/vmlinuz initrd /live/initrd.img - append boot=live persistent=cryptsetup persistence-encryption=luks nocomponents=xfce4-panel username=xebian hostname=xebian persistence + append boot=live persistent=cryptsetup persistence-encryption=luks persistence END diff --git a/config/includes.binary/boot/grub/loopback.cfg b/config/includes.binary/boot/grub/loopback.cfg index e6d8d78..50ec6bb 100644 --- a/config/includes.binary/boot/grub/loopback.cfg +++ b/config/includes.binary/boot/grub/loopback.cfg @@ -1,17 +1,17 @@ menuentry "Live" { - linux /live/vmlinuz boot=live nocomponents=xfce4-panel username=xebian hostname=xebian findiso=${iso_path} -- + linux /live/vmlinuz boot=live findiso=${iso_path} -- initrd /live/initrd.img } menuentry "Live (Failsafe)" { - linux /live/vmlinuz boot=live nocomponents=xfce4-panel config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal findiso=${iso_path} -- + linux /live/vmlinuz boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal findiso=${iso_path} -- initrd /live/initrd.img } menuentry "Install" { - linux /install/vmlinuz vga=788 nocomponents=xfce4-panel findiso=${iso_path} quiet -- + linux /install/vmlinuz vga=788 findiso=${iso_path} quiet -- initrd /install/initrd.gz } menuentry "Graphical Install" { - linux /install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=788 nocomponents=xfce4-panel findiso=${iso_path} quiet -- + linux /install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=788 findiso=${iso_path} quiet -- initrd /install/gtk/initrd.gz } menuentry "Test memory" { diff --git a/config/includes.chroot/etc/live/config.conf b/config/includes.chroot/etc/live/config.conf new file mode 100644 index 0000000..5533d87 --- /dev/null +++ b/config/includes.chroot/etc/live/config.conf @@ -0,0 +1,6 @@ +## live-config has got the impression it should reset xfce4-panel's settings, after we've set them. +LIVE_CONFIG_NOCOMPONENTS=xfce4-panel +## Set our user and host names. +LIVE_HOSTNAME=xebian +LIVE_USERNAME=xebian +LIVE_USER_FULLNAME="Xebian live user" |