summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-02-26 19:50:49 +0100
committerDaniel Baumann <daniel@debian.org>2012-02-26 19:50:49 +0100
commitea22359fa6b691c15243963619b4f0f5a0355ac0 (patch)
tree9a046e98b708072168bd9ebeee0df451060c1fde /scripts/build
parent545abd3b7f68822f1db8e378489648721976e71a (diff)
downloadvyos-live-build-ea22359fa6b691c15243963619b4f0f5a0355ac0.tar.gz
vyos-live-build-ea22359fa6b691c15243963619b4f0f5a0355ac0.zip
Removing --hostname 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_config12
5 files changed, 1 insertions, 75 deletions
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index b1d456f19..2672e8e36 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -180,22 +180,6 @@ then
esac
fi
-if [ -n "${LB_HOSTNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- ;;
-
- live-boot)
- if [ "${LB_HOSTNAME}" != "debian" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- 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 35db53517..0ffe6f3a9 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -154,22 +154,6 @@ then
esac
fi
-if [ -n "${LB_HOSTNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- ;;
-
- live-boot)
- if [ "${LB_HOSTNAME}" != "debian" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- 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 569cdb6c3..7b39a28b6 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -144,22 +144,6 @@ then
esac
fi
-if [ -n "${LB_HOSTNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- ;;
-
- live-boot)
- if [ "${LB_HOSTNAME}" != "debian" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- 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 6420e2110..5a8907b53 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -186,22 +186,6 @@ then
esac
fi
-if [ -n "${LB_HOSTNAME}" ]
-then
- case "${LB_INITRAMFS}" in
- casper)
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- ;;
-
- live-boot)
- if [ "${LB_HOSTNAME}" != "debian" ]
- then
- LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
- 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_config b/scripts/build/lb_config
index 2f5d83191..a20472dd1 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -75,7 +75,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\
\t [--hooks FILE]\n\
-\t [--hostname NAME]\n\
\t [--ignore-system-defaults]\n\
\t [--includes PATH|none]\n\
\t [--initramfs auto|none|live-boot|casper]\n\
@@ -168,7 +167,7 @@ Local_arguments ()
package-lists:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
- grub-splash:,hostname:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:,
+ grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:,
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:,
@@ -660,11 +659,6 @@ Local_arguments ()
shift 2
;;
- --hostname)
- LB_HOSTNAME="${2}"
- shift 2
- ;;
-
--isohybrid-options)
LB_ISOHYBRID_OPTIONS="${2}"
shift 2
@@ -1333,10 +1327,6 @@ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI}"
# (Default: empty)
LB_GRUB_SPLASH="${LB_GRUB_SPLASH}"
-# \$LB_HOSTNAME: set hostname
-# (Default: ${LB_HOSTNAME})
-LB_HOSTNAME="${LB_HOSTNAME}"
-
# \$LB_HDD_LABEL: set hdd label
# (Default: ${LB_HDD_LABEL})
LB_HDD_LABEL="${LB_HDD_LABEL}"