summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2015-05-20 17:54:47 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2015-05-20 17:54:47 -0400
commit830a5dce854892170e6ad3e8c78e2671b4de5d58 (patch)
tree53a821290ee88cd55df440bed299779550794743
parent9d64e68bee44f55466af0aea2fe33cdb9b41918a (diff)
downloadxebian-lb-config-830a5dce854892170e6ad3e8c78e2671b4de5d58.tar.bz2
xebian-lb-config-830a5dce854892170e6ad3e8c78e2671b4de5d58.tar.xz
xebian-lb-config-830a5dce854892170e6ad3e8c78e2671b4de5d58.tar.zst
Remove noconfig=sudo everywhere else, add nocomponents=xfce4-panel a couple places, update username and hostname in persistence-menu.binary, and fix iso-scan/filename => findiso.
-rwxr-xr-xauto/config2
-rwxr-xr-xconfig/hooks/persistence-menu.binary4
-rw-r--r--config/includes.binary/boot/grub/loopback.cfg8
3 files changed, 7 insertions, 7 deletions
diff --git a/auto/config b/auto/config
index f3d918f..68c33ff 100755
--- a/auto/config
+++ b/auto/config
@@ -75,6 +75,6 @@ lb config noauto \
--iso-publisher "Unit 193" \
--iso-volume "Xubuntu Live" \
--linux-packages linux-image \
- --bootappend-live "boot=live nocomponents=xfce4-panel noconfig=sudo username=xubuntu hostname=xubuntu" \
+ --bootappend-live "boot=live nocomponents=xfce4-panel username=xubuntu hostname=xubuntu" \
$lb_opts \
"$@"
diff --git a/config/hooks/persistence-menu.binary b/config/hooks/persistence-menu.binary
index a88f305..51801c4 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 noconfig=sudo username=root hostname=kali persistence
+ append boot=live nocomponents=xfce4-panel username=xubuntu hostname=xubuntu 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 noconfig=sudo username=root hostname=kali persistence
+ append boot=live persistent=cryptsetup persistence-encryption=luks nocomponents=xfce4-panel username=xubuntu hostname=xubuntu persistence
END
diff --git a/config/includes.binary/boot/grub/loopback.cfg b/config/includes.binary/boot/grub/loopback.cfg
index 18ad692..d567f80 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 noconfig=sudo username=xubuntu hostname=xubuntu iso-scan/filename=${iso_path} --
+ linux /live/vmlinuz boot=live nocomponents=xfce4-panel username=xubuntu hostname=xubuntu findiso=${iso_path} --
initrd /live/initrd.img
}
menuentry "Live (Failsafe)" {
- linux /live/vmlinuz boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal iso-scan/filename=${iso_path} --
+ linux /live/vmlinuz boot=live nocomponents=xfce4-panel 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 iso-scan/filename=${iso_path} quiet --
+ linux /install/vmlinuz vga=788 nocomponents=xfce4-panel findiso=${iso_path} quiet --
initrd /install/initrd.gz
}
menuentry "Graphical Install" {
- linux /install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=788 iso-scan/filename=${iso_path} quiet --
+ linux /install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=788 nocomponents=xfce4-panel findiso=${iso_path} quiet --
initrd /install/gtk/initrd.gz
}
menuentry "Test memory" {