diff options
Diffstat (limited to 'initrd')
| -rw-r--r-- | initrd/distro-specs/suse/functions-10.0 | 5 | ||||
| -rwxr-xr-x | initrd/mkdxsinitrd | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0 index f0d60599..ed41d1f7 100644 --- a/initrd/distro-specs/suse/functions-10.0 +++ b/initrd/distro-specs/suse/functions-10.0 @@ -9,7 +9,10 @@ # # Version: 0.2.1f -# +# empty preinit to overwrite settings from the 9.3 file +postinit () { +: +} # udev service udev_hotplug () { diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index a87906c6..865f7b6f 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -567,6 +567,10 @@ chmod 755 ${INSTDIR}/init \ if [ -f /etc/dxs/client.cfg/machine-setup.default ] ; then cp /etc/dxs/client.cfg/machine-setup.default \ ${INSTDIR}/etc/machine-setup +# fixme: dirty hack if the installer does not creates a normal file +elif [ -f /etc/dxs/client.cfg/machine-setup.default.new ] ; then + cp /etc/dxs/client.cfg/machine-setup.default.new \ + ${INSTDIR}/etc/machine-setup elif [ -f ../installer/default_files/machine-setup.default ] ; then cp ../installer/default_files/machine-setup.default \ ${INSTDIR}/etc/machine-setup |