diff options
| author | Dirk | 2014-04-14 00:25:10 +0200 |
|---|---|---|
| committer | Dirk | 2014-04-14 00:25:10 +0200 |
| commit | 6b3580683cb018f2d45729a6fe12725ee404a399 (patch) | |
| tree | de28a60ab9ccf74d6f36619b7c99a553cc2b7fb8 | |
| parent | ... (diff) | |
| download | core-6b3580683cb018f2d45729a6fe12725ee404a399.tar.gz core-6b3580683cb018f2d45729a6fe12725ee404a399.tar.xz core-6b3580683cb018f2d45729a6fe12725ee404a399.zip | |
More fixes ...
| -rw-r--r-- | src/initramfs/distro-specs/ubuntu/functions-default | 4 | ||||
| -rw-r--r-- | src/initramfs/scripts/etc/functions | 2 | ||||
| -rwxr-xr-x | src/initramfs/scripts/init | 3 | ||||
| -rw-r--r-- | src/installer/OpenSLX/OSExport/FileSystem/NFS.pm | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/initramfs/distro-specs/ubuntu/functions-default b/src/initramfs/distro-specs/ubuntu/functions-default index 2fccfc4b..55dd7c59 100644 --- a/src/initramfs/distro-specs/ubuntu/functions-default +++ b/src/initramfs/distro-specs/ubuntu/functions-default @@ -105,14 +105,14 @@ initial_boot () { upstart_set_starton () { local script="$1" local starton="$2" - local file_not_found="f" + local file_not_found="f" if [ -e /mnt/etc/init.inactive/${script}.conf ]; then local script_path=/mnt/etc/init.inactive/${script}.conf elif [ -e /mnt/etc/init/${script}.conf ]; then local script_path=/mnt/etc/init/${script}.conf else - local file_not_found="t" + local file_not_found="t" fi if [ "$file_not_found" = "f" ]; then diff --git a/src/initramfs/scripts/etc/functions b/src/initramfs/scripts/etc/functions index 417ff03b..76f5138b 100644 --- a/src/initramfs/scripts/etc/functions +++ b/src/initramfs/scripts/etc/functions @@ -1,5 +1,5 @@ # Copyright (c) 2003..2006 - RZ Uni Freiburg -# Copyright (c) 2006..2013 - 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 diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index 59cfea8a..5752440c 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -1,6 +1,6 @@ #!/bin/sh # Copyright (c) 2003..2006 - RZ Uni Freiburg -# Copyright (c) 2006..2011 - OpenSLX GmbH +# Copyright (c) 2006..2014 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -1123,5 +1123,6 @@ unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ runinithook '99-handing-over' # new style of pivoting (switch_root or run-init) +# Ubuntu Upstart is a nasty mess, enable debugging from level 4 and above exec /sbin/switch_root -c dev/console /mnt /sbin/init $DEBUG_UPSTART || \ error "$init_runinit" diff --git a/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm index 96e40d24..8119066c 100644 --- a/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm +++ b/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006..2011 - OpenSLX GmbH +# Copyright (c) 2006..2014 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -132,7 +132,7 @@ sub requiredFSMods { my $self = shift; - return qw( nfs ); + return qw( nfs nfsv3 nfsv4 ); } sub showExportConfigInfo |