summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-02-26 19:55:28 +0100
committerDaniel Baumann <daniel@debian.org>2012-02-26 19:55:28 +0100
commit7809c0ef964d22a8622c51d6cdf846b443099d19 (patch)
tree310e9e850561627d07a27cefa09f28d1f3d5a001 /scripts/build
parentea22359fa6b691c15243963619b4f0f5a0355ac0 (diff)
downloadvyos-live-build-7809c0ef964d22a8622c51d6cdf846b443099d19.tar.gz
vyos-live-build-7809c0ef964d22a8622c51d6cdf846b443099d19.zip
Removing --username cruft, live-config bootparameters should be used via --bootappend-live.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_grub16
-rwxr-xr-xscripts/build/lb_binary_grub216
-rwxr-xr-xscripts/build/lb_binary_silo16
-rwxr-xr-xscripts/build/lb_binary_yaboot16
-rwxr-xr-xscripts/build/lb_chroot_hacks5
-rwxr-xr-xscripts/build/lb_config12
6 files changed, 1 insertions, 80 deletions
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 2672e8e36..958de3e21 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -164,22 +164,6 @@ Check_multiarchitectures
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LB_USERNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- ;;
-
- live-boot)
- if [ "${LB_USERNAME}" != "user" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- fi
- ;;
- esac
-fi
-
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index 0ffe6f3a9..65ab26aae 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -138,22 +138,6 @@ Check_multiarchitectures
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LB_USERNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- ;;
-
- live-boot)
- if [ "${LB_USERNAME}" != "user" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- fi
- ;;
- esac
-fi
-
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index 7b39a28b6..cf8c181c7 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -128,22 +128,6 @@ esac
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LB_USERNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- ;;
-
- live-boot)
- if [ "${LB_USERNAME}" != "user" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- fi
- ;;
- esac
-fi
-
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index 5a8907b53..47266baec 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -170,22 +170,6 @@ Check_multiarchitectures
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-if [ -n "${LB_USERNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- ;;
-
- live-boot)
- if [ "${LB_USERNAME}" != "user" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
- fi
- ;;
- esac
-fi
-
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 751216476..128d6b849 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -246,11 +246,6 @@ case "${LB_INITRAMFS}" in
;;
esac
-if [ -d chroot/home/${LB_USERNAME} ] && [ "${ID}" ]
-then
- chown -R --quiet ${ID}:${ID} chroot/home/${LB_USERNAME}
-fi
-
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# This is a temporary hack to get rid of fstab;
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index a20472dd1..16235b25f 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -143,7 +143,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--volatile true|false]\n\
\t [--backports true|false]\n\
\t [--exposed-root true|false]\n\
-\t [--username NAME]\n\
\t [--verbose]\n\
\t [--win32-loader true|false]\n\
\t [--bootstrap-qemu-exclude PACKAGES]\n\
@@ -171,7 +170,7 @@ Local_arguments ()
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
net-cow-server:,net-tarball:,swap-file-path:,swap-file-size:,syslinux-theme:,
- username:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
+ win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
help,ignore-system-defaults,quiet,usage,verbose,version,bootstrap-qemu-static:,bootstrap-qemu-arch:,
bootstrap-qemu-exclude:"
# Remove spaces added by indentation
@@ -764,11 +763,6 @@ Local_arguments ()
shift 2
;;
- --username)
- LB_USERNAME="${2}"
- shift 2
- ;;
-
--win32-loader)
LB_WIN32_LOADER="${2}"
shift 2
@@ -1410,10 +1404,6 @@ LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE}"
# \$LB_SYSLINUX_THEME: set syslinux theme package
# (Default: ${LB_SYSLINUX_THEME})
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME}"
-
-# \$LB_USERNAME: set username
-# (Default: ${LB_USERNAME})
-LB_USERNAME="${LB_USERNAME}"
EOF
# Creating lb_source_* configuration