summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-31 11:32:57 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-31 11:53:29 +0000
commit5d4ce5700c238a5dfcdb43f8e22bd702b91c9569 (patch)
treebab90960b470abd70771ec20034842790bade714
parentUsing references to system-build instead of live-build. (diff)
downloadsystem-build-5d4ce5700c238a5dfcdb43f8e22bd702b91c9569.tar.xz
system-build-5d4ce5700c238a5dfcdb43f8e22bd702b91c9569.zip
Using system-boot instead of live-boot.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xfunctions/defaults.sh4
-rwxr-xr-xscripts/build/binary_grub-legacy4
-rwxr-xr-xscripts/build/binary_grub-pc4
-rwxr-xr-xscripts/build/binary_linux-image8
-rwxr-xr-xscripts/build/binary_loopback_cfg2
-rwxr-xr-xscripts/build/binary_manifest2
-rwxr-xr-xscripts/build/binary_memtest2
-rwxr-xr-xscripts/build/binary_rootfs2
-rwxr-xr-xscripts/build/binary_syslinux4
-rwxr-xr-xscripts/build/chroot_firmware2
-rwxr-xr-xscripts/build/chroot_hacks6
-rwxr-xr-xscripts/build/chroot_linux-image2
-rwxr-xr-xscripts/build/chroot_live-packages2
-rwxr-xr-xscripts/build/config6
-rw-r--r--share/bootloaders/extlinux/splash.svg2
-rw-r--r--share/bootloaders/isolinux/splash.svg2
-rw-r--r--share/bootloaders/pxelinux/splash.svg2
-rw-r--r--share/bootloaders/syslinux/splash.svg2
18 files changed, 29 insertions, 29 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index d47d0f800..ca1782759 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -221,7 +221,7 @@ Set_defaults ()
# Setting initramfs hook
case "${LB_SYSTEM}" in
live)
- LB_INITRAMFS="${LB_INITRAMFS:-live-boot}"
+ LB_INITRAMFS="${LB_INITRAMFS:-system-boot}"
;;
normal)
@@ -590,7 +590,7 @@ Set_defaults ()
# Setting boot parameters
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live components quiet splash}"
LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
;;
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index f885c00cc..de710008d 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -141,7 +141,7 @@ else
fi
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
INITFS="live"
;;
@@ -154,7 +154,7 @@ esac
case "${LIVE_IMAGE_TYPE}" in
iso*|tar)
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
DESTDIR_LIVE="binary/live"
;;
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index 1eae93a2a..db7f528a8 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -117,7 +117,7 @@ else
fi
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
INITFS="live"
;;
@@ -130,7 +130,7 @@ esac
case "${LIVE_IMAGE_TYPE}" in
iso*|tar)
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
DESTDIR_LIVE="binary/live"
;;
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index 6227a241c..05556f1c2 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -44,7 +44,7 @@ Check_lockfile .lock
Create_lockfile .lock
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
DESTDIR="binary/live"
;;
@@ -73,10 +73,10 @@ cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
cp chroot/boot/initrd.img-* "${DESTDIR}"
case "${LB_INITRAMFS}" in
- live-boot)
- if [ -e chroot/usr/share/doc/live-boot/parameters.txt ]
+ system-boot)
+ if ls chroot/usr/share/doc/*system-boot/parameters.txt > /dev/null 2>&1
then
- cp chroot/usr/share/doc/live-boot/parameters.txt "${DESTDIR}"/parameters
+ cp chroot/usr/share/doc/*system-boot/parameters.txt "${DESTDIR}"/parameters
fi
;;
esac
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 6034ddc36..76e552007 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -102,7 +102,7 @@ else
fi
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
INITFS="live"
;;
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index ceee2c380..b7804528e 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -44,7 +44,7 @@ Check_lockfile .lock
Create_lockfile .lock
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
INITFS="live"
SUFFIX="packages"
;;
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 96fb4f101..f756cf183 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -80,7 +80,7 @@ Install_package
# Setting destination directory
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
DESTDIR="binary/live"
;;
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 6c797acb3..8714c19d9 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -49,7 +49,7 @@ case "${LB_ARCHITECTURES}" in
esac
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
INITFS="live"
;;
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index a07162201..21f84008a 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -264,7 +264,7 @@ _SECOND="$(date +%S)"
_LINUX_VERSIONS="$(for _LINUX in chroot/boot/vmlinuz-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e 's|vmlinuz-|linux-image-|') | awk '/Installed: / { print $2 }' ; done | sort -Vru | tr "\n" " ")"
_SYSTEM_BUILD_VERSION="$(lb --version)"
-_LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')"
+_SYSTEM_BOOT_VERSION="$(chroot chroot apt-cache policy open-infrastructure-system-boot | awk '/Installed: / { print $2 }')"
_LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')"
_LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')"
@@ -300,7 +300,7 @@ do
-e "s|@SECOND@|${_SECOND}|g" \
-e "s|@LINUX_VERSIONS@|${_LINUX_VERSIONS}|g" \
-e "s|@SYSTEM_BUILD_VERSION@|${_SYSTEM_BUILD_VERSION}|g" \
- -e "s|@LIVE_BOOT_VERSION@|${_LIVE_BOOT_VERSION}|g" \
+ -e "s|@SYSTEM_BOOT_VERSION@|${_SYSTEM_BOOT_VERSION}|g" \
-e "s|@LIVE_CONFIG_VERSION@|${_LIVE_CONFIG_VERSION}|g" \
-e "s|@LIVE_TOOLS_VERSION@|${_LIVE_TOOLS_VERSION}|g" \
"${_FILE}"
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware
index ca208682b..d9455bbac 100755
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@@ -46,7 +46,7 @@ Check_package host /usr/bin/wget wget
# Diverting update-initramfs
#case "${LB_INITRAMFS}" in
-# live-boot)
+# system-boot)
# mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
# ;;
#esac
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 888fdbe23..20eb1afdf 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -65,7 +65,7 @@ esac
# Update initramfs (always, because of udev rules in initrd)
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
#UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
;;
esac
@@ -100,7 +100,7 @@ case "${LB_INITRAMFS_COMPRESSION}" in
esac
case "${LB_INITRAMFS}" in
- live-boot)
+ system-boot)
ID="1000"
;;
@@ -114,7 +114,7 @@ rm -f chroot/etc/hosts
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# This is a temporary hack to get rid of fstab;
- # needs cleanup in live-boot first to proper fix.
+ # needs cleanup in system-boot first to proper fix.
rm -f chroot/etc/fstab
touch chroot/etc/fstab
fi
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index a96c4e529..5c9aeb353 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -43,7 +43,7 @@ Create_lockfile .lock
# Diverting update-initramfs
#case "${LB_INITRAMFS}" in
-# live-boot)
+# system-boot)
# mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
# ;;
#esac
diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages
index bd32c90ad..ba1da648a 100755
--- a/scripts/build/chroot_live-packages
+++ b/scripts/build/chroot_live-packages
@@ -36,7 +36,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Queue installation of live-boot
+# Queue installation of system-boot
if [ -n "${LB_INITRAMFS}" ] && [ "${LB_INITRAMFS}" != "none" ]
then
_PACKAGES="${LB_INITRAMFS}"
diff --git a/scripts/build/config b/scripts/build/config
index b6909eae8..2c04918f7 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -59,7 +59,7 @@ USAGE="${PROGRAM} [--apt-ftp-proxy URL]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\
\t [--ignore-system-defaults]\n\
-\t [--initramfs auto|none|live-boot]\n\
+\t [--initramfs auto|none|system-boot]\n\
\t [--initramfs-compression bzip2|gzip|lzma]\n\
\t [--initsystem sysvinit|systemd|none]\n\
\t [--image-name [NAME]\n\
@@ -1336,8 +1336,8 @@ then
mkdir -p config/package-lists
case "${LB_INITRAMFS}" in
- live-boot)
- echo "live-boot" > config/package-lists/live.list.chroot
+ system-boot)
+ echo "system-boot" > config/package-lists/live.list.chroot
echo "live-config" >> config/package-lists/live.list.chroot
case "${LB_INITSYSTEM}" in
diff --git a/share/bootloaders/extlinux/splash.svg b/share/bootloaders/extlinux/splash.svg
index 9915522a1..8c47207b7 100644
--- a/share/bootloaders/extlinux/splash.svg
+++ b/share/bootloaders/extlinux/splash.svg
@@ -274,7 +274,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3068">system-boot: @SYSTEM_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
diff --git a/share/bootloaders/isolinux/splash.svg b/share/bootloaders/isolinux/splash.svg
index 9915522a1..8c47207b7 100644
--- a/share/bootloaders/isolinux/splash.svg
+++ b/share/bootloaders/isolinux/splash.svg
@@ -274,7 +274,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3068">system-boot: @SYSTEM_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
diff --git a/share/bootloaders/pxelinux/splash.svg b/share/bootloaders/pxelinux/splash.svg
index 9915522a1..8c47207b7 100644
--- a/share/bootloaders/pxelinux/splash.svg
+++ b/share/bootloaders/pxelinux/splash.svg
@@ -274,7 +274,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3068">system-boot: @SYSTEM_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
diff --git a/share/bootloaders/syslinux/splash.svg b/share/bootloaders/syslinux/splash.svg
index 9915522a1..8c47207b7 100644
--- a/share/bootloaders/syslinux/splash.svg
+++ b/share/bootloaders/syslinux/splash.svg
@@ -274,7 +274,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
+ id="tspan3068">system-boot: @SYSTEM_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"