summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/initramfs/distro-specs/ubuntu/functions-14.043
-rw-r--r--src/initramfs/distro-specs/ubuntu/functions-default6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/initramfs/distro-specs/ubuntu/functions-14.04 b/src/initramfs/distro-specs/ubuntu/functions-14.04
index 7cbfb964..291edfd5 100644
--- a/src/initramfs/distro-specs/ubuntu/functions-14.04
+++ b/src/initramfs/distro-specs/ubuntu/functions-14.04
@@ -48,12 +48,13 @@ required." >/mnt/etc/init.inactive/README
container-detect console-font \
dmesg hwclock hwclock-save irqbalance module-init-tools \
mountall mounted* networking procps rc* tty* udev* \
+ systemd-logind upstart-file-bridge \
upstart-socket-bridge upstart-udev-bridge ; do
mv /mnt/etc/init.inactive/${file}.conf /mnt/etc/init >/dev/null 2>&1
done
# for screen sessions
- testmkd /mnt/var/run/screen root:utmp 0777
+ testmkd /mnt/var/run/screen root:utmp 0775
# apt stuff
testmkd /mnt/var/cache/apt/archives/partial
diff --git a/src/initramfs/distro-specs/ubuntu/functions-default b/src/initramfs/distro-specs/ubuntu/functions-default
index d28796bc..df885556 100644
--- a/src/initramfs/distro-specs/ubuntu/functions-default
+++ b/src/initramfs/distro-specs/ubuntu/functions-default
@@ -1,5 +1,5 @@
# Copyright (c) 2003..2006 - RZ Uni Freiburg
-# Copyright (c) 2006..2011 - OpenSLX GmbH
+# Copyright (c) 2006..2014 - OpenSLX GmbH
#
# This program/file is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -52,7 +52,6 @@ config_netconsole () {
dmesg -n 8
}
-
# distro specific function called from servconfig script
config_distro () {
# runlevel system changed significantly compared to pre 9.10 sys-v-init
@@ -75,6 +74,7 @@ required." >/mnt/etc/init.inactive/README
container-detect console-font \
dmesg hwclock hwclock-save irqbalance module-init-tools \
mountall mounted* networking procps rc* tty* udev* \
+ systemd-logind upstart-file-bridge \
upstart-socket-bridge upstart-udev-bridge ; do
mv /mnt/etc/init.inactive/${file}.conf /mnt/etc/init >/dev/null 2>&1
done
@@ -83,7 +83,7 @@ required." >/mnt/etc/init.inactive/README
rm /mnt/etc/udev/rules.d/*persistent*.rules >/dev/null 2>&1
# for screen sessions
- testmkd /mnt/var/run/screen root:utmp 0777
+ testmkd /mnt/var/run/screen root:utmp 0775
# apt stuff
testmkd /mnt/var/cache/apt/archives/partial