summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/initramfs/distro-specs/ubuntu/functions-default13
-rw-r--r--src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm2
2 files changed, 9 insertions, 6 deletions
diff --git a/src/initramfs/distro-specs/ubuntu/functions-default b/src/initramfs/distro-specs/ubuntu/functions-default
index 6022a2e9..8518d7b6 100644
--- a/src/initramfs/distro-specs/ubuntu/functions-default
+++ b/src/initramfs/distro-specs/ubuntu/functions-default
@@ -25,7 +25,10 @@ D_BINDMPTS="tmp root home media"
D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
/var/lib/pango /var/lib/defoma /var/cache/fontconfig /var/lib/dkms"
-D_DIRINDXS="/var/run/sysconfig/tmp /var/lib/nobody /var/lib/misc /var/lib/pam \
+# creating required(?) directories like /var/run/sysconfig/tmp or
+# /var/run/console does not make much sense here as they get overmounted,
+# see ticket #813
+D_DIRINDXS="/var/lib/nobody /var/lib/misc /var/lib/pam \
/var/lib/bluetooth /var/lib/texmf /var/lib/nfs/sm /var/lib/acpi_support \
/var/spool/cron /var/lib/alsa"
@@ -43,7 +46,7 @@ config_netconsole () {
local T_IP=$4
local T_MAC=$(arp -n |grep $T_IP| awk '{print $5}')
# FIXME: we need to set a valid ip for ethx if we use the bridge config
- # from the virtualization plugins
+ # from the virtualization plugins
[ "$MY_OLDDEV" = "$MY_DEV" ] || ip a a $MY_IP dev $MY_OLDDEV
modprobe netconsole netconsole=4444@$MY_IP/$MY_OLDDEV,514@$T_IP/$T_MAC
dmesg -n 8
@@ -71,7 +74,7 @@ required." >/mnt/etc/init.inactive/README
for file in alsa-mixer-save control-alt-delete console-setup dbus \
dmesg hwclock hwclock-save irqbalance module-init-tools \
mountall mounted* networking procps rc* tty* udev* \
- upstart-udev-bridge ; do
+ upstart-socket-bridge upstart-udev-bridge ; do
mv /mnt/etc/init.inactive/${file}.conf /mnt/etc/init >/dev/null 2>&1
done
@@ -176,7 +179,7 @@ config_ntp () {
if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then
echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
>>/mnt/etc/passwd
- testmkd /mnt/var/lib/ntp/var/run/ntp
+ # testmkd /mnt/var/lib/ntp/var/run/ntp # see #813
fi
}
@@ -213,7 +216,7 @@ fi
config_sshd () {
if [ "x$start_sshd" = "xyes" ] ; then
if [ -f /mnt/etc/init.inactive/ssh.conf ] ; then
- testmkd /mnt/var/run/sshd
+ # testmkd /mnt/var/run/sshd # see #813
mv /mnt/etc/init.inactive/ssh.conf /mnt/etc/init
else
error "$df_errsshd" nonfatal
diff --git a/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index d4b28947..6f180c68 100644
--- a/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2006..2011 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING