diff options
| author | Dirk von Suchodoletz | 2009-08-21 18:36:04 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-08-21 18:36:04 +0200 |
| commit | 45981e4d1fbef3c4bbb0d0f4a52086820340efb5 (patch) | |
| tree | 6fc904abfb45372063da55560f6fbc073f992f38 | |
| parent | fixed bzip2 bug of rpm2cpio (diff) | |
| download | core-45981e4d1fbef3c4bbb0d0f4a52086820340efb5.tar.gz core-45981e4d1fbef3c4bbb0d0f4a52086820340efb5.tar.xz core-45981e4d1fbef3c4bbb0d0f4a52086820340efb5.zip | |
Fixing hw_local_disk issue ... (see mailing list)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3125 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm | 1 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm index 0f1ad35d..ec80f6a6 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm @@ -307,6 +307,7 @@ sub _writeInitramfsSetup 'ramfs_miscmods' => $self->{attrs}->{ramfs_miscmods} || '', 'ramfs_nicmods' => $self->{attrs}->{ramfs_nicmods} || '', 'rootfs' => $self->{'export-uri'} || '', + 'hw_local_disk' => $self->{attrs}->{hw_local_disk} || '', }; my $content = "# attributes set by slxconfig-demuxer:\n"; foreach my $attr (keys %$initramfsAttrs) { diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 550afaa7..df1552d5 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -206,8 +206,9 @@ return 0 # load distro specific configuration variables and functions. distro # specific functions may overwrite functions defined in /etc/functions . /etc/distro-functions -# source general slx settings +# source general slx and initramfs-setup settings . /etc/slxsystem.conf +. /etc/initramfs-setup # script run timer [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 21 ] && \ @@ -235,7 +236,12 @@ case $1 in # if required and mounting) disk) # if disk action is not disabled (see #470) - [ "x${hw_local_disk}" != "xno" ] && disk + if [ "x${hw_local_disk}" != "xno" ] ; then + disk + else + echo "using harddisk switched off by hw_local_disk set to 'no' ( $(sysup) )" \ + >/tmp/tmpready + fi ;; # remove unneeded kernel modules finish) |