diff options
| author | Dirk von Suchodoletz | 2006-09-19 18:04:24 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-09-19 18:04:24 +0200 |
| commit | 5bfcdd11646217c1722477caf366923150a84a2f (patch) | |
| tree | 82d9f1f39656faf530c10fce39bd538d0ab6f035 /installer | |
| parent | Still fixes needed for the directory change (see last checkins), (diff) | |
| download | core-5bfcdd11646217c1722477caf366923150a84a2f.tar.gz core-5bfcdd11646217c1722477caf366923150a84a2f.tar.xz core-5bfcdd11646217c1722477caf366923150a84a2f.zip | |
Small fixes: scanner udev rule moved to the end of hwautocfg (wait for
completion of /mnt/etc), fix in ld4-inst (generate pxelinux.cfg subdir),
duplicate in machine-setup.default removed ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@382 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/default_files/machine-setup.default | 3 | ||||
| -rwxr-xr-x | installer/ld4-inst | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index 86a6b7d6..47209528 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -71,9 +71,6 @@ start_dreshal="yes" # start alsa sound system start_alsasound="yes" -# start ssh server -start_sshd="yes" - # smb protocol service (provide windows file service) start_samba="may" netbios_workgroup="dxs-network" diff --git a/installer/ld4-inst b/installer/ld4-inst index bb11d364..12a23626 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -4,7 +4,7 @@ # cloning from rsync source for Diskless X Stations (v4.0) # # Author(s): Nico Dietrich, 04-04-2006 -# Dirk von Suchodoletz <dirk@goe.net>, 18-09-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 19-09-2006 # Michael Janczyk, <mj0>, 06-07-2006 # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg @@ -355,7 +355,7 @@ kernel_choice "${kernel_choice}" fi choice=( ${kernel_choice} ) # make sure /$tftbootdir exists - mkdir -p ${tftpbootdir} + mkdir -p ${tftpbootdir}/pxelinux.cfg 2>/dev/null declare -i j=0 # add nfs modules nevertheless |