summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-06-29 11:17:52 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-06-29 11:17:52 +0000
commit2bb8884ac09e721d36c164605f5404f7ba538444 (patch)
tree49c76708f8355b32903e34f89b1d4c41e43c32ac
parentUpdating. (diff)
downloadsystem-images-2bb8884ac09e721d36c164605f5404f7ba538444.tar.xz
system-images-2bb8884ac09e721d36c164605f5404f7ba538444.zip
Updating.
-rwxr-xr-xshare/images/container-server/auto/config1
-rw-r--r--share/images/container-server/config/bootloaders/extlinux/install.cfg4
-rw-r--r--share/images/container-server/config/bootloaders/isolinux/install.cfg4
-rw-r--r--share/images/container-server/config/bootloaders/pxelinux/install.cfg4
-rw-r--r--share/images/container-server/config/bootloaders/syslinux/install.cfg4
5 files changed, 9 insertions, 8 deletions
diff --git a/share/images/container-server/auto/config b/share/images/container-server/auto/config
index 520a178..8662960 100755
--- a/share/images/container-server/auto/config
+++ b/share/images/container-server/auto/config
@@ -18,4 +18,5 @@ lb config noauto \
--mode debian \
--debian-installer live \
--source "${SOURCE}" \
+ --bootappend-install 'file=/cdrom/installer/preseed.cfg' \
"${@}"
diff --git a/share/images/container-server/config/bootloaders/extlinux/install.cfg b/share/images/container-server/config/bootloaders/extlinux/install.cfg
index 629922a..30685cf 100644
--- a/share/images/container-server/config/bootloaders/extlinux/install.cfg
+++ b/share/images/container-server/config/bootloaders/extlinux/install.cfg
@@ -2,10 +2,10 @@ label install
menu label ^Install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install-failsafe
menu label Install (failsafe)
linux /install/vmlinuz
initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/images/container-server/config/bootloaders/isolinux/install.cfg b/share/images/container-server/config/bootloaders/isolinux/install.cfg
index 8722f90..30685cf 100644
--- a/share/images/container-server/config/bootloaders/isolinux/install.cfg
+++ b/share/images/container-server/config/bootloaders/isolinux/install.cfg
@@ -2,10 +2,10 @@ label install
menu label ^Install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ file=/cdrom/installer/container-server_manual_amd64.cfg --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install-failsafe
menu label Install (failsafe)
linux /install/vmlinuz
initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/images/container-server/config/bootloaders/pxelinux/install.cfg b/share/images/container-server/config/bootloaders/pxelinux/install.cfg
index 629922a..30685cf 100644
--- a/share/images/container-server/config/bootloaders/pxelinux/install.cfg
+++ b/share/images/container-server/config/bootloaders/pxelinux/install.cfg
@@ -2,10 +2,10 @@ label install
menu label ^Install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install-failsafe
menu label Install (failsafe)
linux /install/vmlinuz
initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/images/container-server/config/bootloaders/syslinux/install.cfg b/share/images/container-server/config/bootloaders/syslinux/install.cfg
index 629922a..30685cf 100644
--- a/share/images/container-server/config/bootloaders/syslinux/install.cfg
+++ b/share/images/container-server/config/bootloaders/syslinux/install.cfg
@@ -2,10 +2,10 @@ label install
menu label ^Install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install-failsafe
menu label Install (failsafe)
linux /install/vmlinuz
initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- cgroup_enable=memory elevator=deadline swapaccount=1 quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet