summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-31 10:53:10 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-31 11:53:29 +0000
commit1395f5fc41723a9308ba8ded07ad95c3ca828b0a (patch)
tree158f524f47fdd0598acbe0599fd2754c6e219bb5
parentUsing system-boot instead of live-boot. (diff)
downloadsystem-build-1395f5fc41723a9308ba8ded07ad95c3ca828b0a.tar.xz
system-build-1395f5fc41723a9308ba8ded07ad95c3ca828b0a.zip
Using system-config instead of live-config.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xscripts/build/binary_syslinux4
-rwxr-xr-xscripts/build/chroot_live-packages4
-rwxr-xr-xscripts/build/config17
-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
-rwxr-xr-xshare/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot2
8 files changed, 10 insertions, 25 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 21f84008a..75002538e 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -265,7 +265,7 @@ _LINUX_VERSIONS="$(for _LINUX in chroot/boot/vmlinuz-* ; do chroot chroot apt-ca
_SYSTEM_BUILD_VERSION="$(lb --version)"
_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 }')"
+_SYSTEM_CONFIG_VERSION="$(chroot chroot apt-cache policy open-infrastructure-system-config | awk '/Installed: / { print $2 }')"
_LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')"
case "${LB_MODE}" in
@@ -301,7 +301,7 @@ do
-e "s|@LINUX_VERSIONS@|${_LINUX_VERSIONS}|g" \
-e "s|@SYSTEM_BUILD_VERSION@|${_SYSTEM_BUILD_VERSION}|g" \
-e "s|@SYSTEM_BOOT_VERSION@|${_SYSTEM_BOOT_VERSION}|g" \
- -e "s|@LIVE_CONFIG_VERSION@|${_LIVE_CONFIG_VERSION}|g" \
+ -e "s|@SYSTEM_CONFIG_VERSION@|${_SYSTEM_CONFIG_VERSION}|g" \
-e "s|@LIVE_TOOLS_VERSION@|${_LIVE_TOOLS_VERSION}|g" \
"${_FILE}"
fi
diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages
index ba1da648a..1a38fb65c 100755
--- a/scripts/build/chroot_live-packages
+++ b/scripts/build/chroot_live-packages
@@ -42,10 +42,10 @@ then
_PACKAGES="${LB_INITRAMFS}"
fi
-# Queue installation of live-config
+# Queue installation of system-config
if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "none" ]
then
- _PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
+ _PACKAGES="${_PACKAGES} system-config"
fi
# Do initsystem specific hacks
diff --git a/scripts/build/config b/scripts/build/config
index 2c04918f7..fe1e93afa 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1338,22 +1338,7 @@ then
case "${LB_INITRAMFS}" in
system-boot)
echo "system-boot" > config/package-lists/live.list.chroot
- echo "live-config" >> config/package-lists/live.list.chroot
-
- case "${LB_INITSYSTEM}" in
- none)
- # do nothing
- ;;
-
- systemd)
- echo "live-config-systemd" >> config/package-lists/live.list.chroot
- ;;
-
- sysvinit)
- echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot
- echo "sysvinit-core" >> config/package-lists/live.list.chroot
- ;;
- esac
+ echo "system-config" >> config/package-lists/live.list.chroot
;;
*)
diff --git a/share/bootloaders/extlinux/splash.svg b/share/bootloaders/extlinux/splash.svg
index 8c47207b7..d823360ee 100644
--- a/share/bootloaders/extlinux/splash.svg
+++ b/share/bootloaders/extlinux/splash.svg
@@ -279,7 +279,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3070">system-config: @SYSTEM_CONFIG_VERSION@</tspan><tspan
y="799.20654"
x="190.68135"
sodipodi:role="line"
diff --git a/share/bootloaders/isolinux/splash.svg b/share/bootloaders/isolinux/splash.svg
index 8c47207b7..d823360ee 100644
--- a/share/bootloaders/isolinux/splash.svg
+++ b/share/bootloaders/isolinux/splash.svg
@@ -279,7 +279,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3070">system-config: @SYSTEM_CONFIG_VERSION@</tspan><tspan
y="799.20654"
x="190.68135"
sodipodi:role="line"
diff --git a/share/bootloaders/pxelinux/splash.svg b/share/bootloaders/pxelinux/splash.svg
index 8c47207b7..d823360ee 100644
--- a/share/bootloaders/pxelinux/splash.svg
+++ b/share/bootloaders/pxelinux/splash.svg
@@ -279,7 +279,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3070">system-config: @SYSTEM_CONFIG_VERSION@</tspan><tspan
y="799.20654"
x="190.68135"
sodipodi:role="line"
diff --git a/share/bootloaders/syslinux/splash.svg b/share/bootloaders/syslinux/splash.svg
index 8c47207b7..d823360ee 100644
--- a/share/bootloaders/syslinux/splash.svg
+++ b/share/bootloaders/syslinux/splash.svg
@@ -279,7 +279,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
- id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
+ id="tspan3070">system-config: @SYSTEM_CONFIG_VERSION@</tspan><tspan
y="799.20654"
x="190.68135"
sodipodi:role="line"
diff --git a/share/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot b/share/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot
index 862704981..b108526fd 100755
--- a/share/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot
+++ b/share/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot
@@ -4,7 +4,7 @@ set -e
# Remove OpenSSH Host Keys.
#
-# This removes openssh-server host keys, they are regenerated by live-config
+# This removes openssh-server host keys, they are regenerated by system-config
# on system start.
rm -f /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub