diff options
| -rw-r--r-- | config-db/OpenSLX/AttributeRoster.pm | 10 | ||||
| -rw-r--r-- | config-db/OpenSLX/DBSchema.pm | 3 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 16 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/servconfig | 26 | ||||
| l--------- | initramfs/uclib-rootfs/bin/mkdosfs | 1 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm | 10 |
6 files changed, 39 insertions, 27 deletions
diff --git a/config-db/OpenSLX/AttributeRoster.pm b/config-db/OpenSLX/AttributeRoster.pm index da7bf960..a33a245b 100644 --- a/config-db/OpenSLX/AttributeRoster.pm +++ b/config-db/OpenSLX/AttributeRoster.pm @@ -171,6 +171,16 @@ sub _init content_descr => 'a space-separated list of NIC modules', default => 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32', }, + 'hw_local_disk' => { + applies_to_systems => 1, + applies_to_clients => 1, + description => unshiftHereDoc(<<' End-of-Here'), + how to handle local disk deploament - no/slx-only/all + End-of-Here + content_regex => undef, + content_descr => 'how to handle local disk (no/slx-only/all)', + default => 'all', + }, 'scratch' => { applies_to_systems => 1, applies_to_clients => 1, diff --git a/config-db/OpenSLX/DBSchema.pm b/config-db/OpenSLX/DBSchema.pm index b4130e15..d3e7573b 100644 --- a/config-db/OpenSLX/DBSchema.pm +++ b/config-db/OpenSLX/DBSchema.pm @@ -370,6 +370,7 @@ sub _schemaUpgradeDBFrom 'attr_country', 'attr_dm_allow_shutdown', 'attr_hw_graphic', + 'attr_hw_local_disk', 'attr_hw_monitor', 'attr_hw_mouse', 'attr_late_dm', @@ -442,6 +443,7 @@ sub _schemaUpgradeDBFrom 'attr_country', 'attr_dm_allow_shutdown', 'attr_hw_graphic', + 'attr_hw_local_disk', 'attr_hw_monitor', 'attr_hw_mouse', 'attr_late_dm', @@ -509,6 +511,7 @@ sub _schemaUpgradeDBFrom 'attr_country', 'attr_dm_allow_shutdown', 'attr_hw_graphic', + 'attr_hw_local_disk', 'attr_hw_monitor', 'attr_hw_mouse', 'attr_late_dm', diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 0d6f162a..40b9e38c 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -147,18 +147,18 @@ noexec\t 0 0" >>/tmp/fstab # if more than one id45 present, the latter ones are simply mounted # over the previous (the mounts are postponed a bit via do_mnt to # have the filesystem completely prepared) - echo -e "waitfor $hdpartnr 4000\n\ - mount -t auto $hdpartnr /mnt/media/${hdpartnr#/dev/*}\n\ + echo -e "waitfor ${hdpartnr} 4000\n\ + mount -t auto ${hdpartnr} /mnt/media/${hdpartnr#/dev/*}\n\ ln -sf /media/${hdpartnr#/dev/*} /mnt/var/scratch" >>/etc/do_mnt - echo -e "$hdpartnr\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto\ + echo -e "${hdpartnr}\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto\ \t\t 0 0" >>/tmp/fstab elif [ ${partid} -eq 46 ] ; then # mount a home directory to (/mnt)/var/home - echo -e "waitfor $hdpartnr 4000\n\ - mount -t auto $hdpartnr /mnt/media/${hdpartnr#/dev/*} \n\ + echo -e "waitfor ${hdpartnr} 4000\n\ + mount -t auto ${hdpartnr} /mnt/media/${hdpartnr#/dev/*} \n\ test -d /mnt/media/${hdpartnr#/dev/*}/home && \ ln -sf /media/${hdpartnr#/dev/*} /mnt/var/home" >>/etc/do_mnt - echo -e "$hdpartnr\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto,\ + echo -e "${hdpartnr}\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto,\ \t 0 0" >>/tmp/fstab fi done @@ -179,7 +179,7 @@ fi finish () { mdev -s # mount filesystem parts (if any) requested in disk setup -[ -f /etc/do_mnt ]] && ash /etc/do_mnt & +[ -f /etc/do_mnt ] && ash /etc/do_mnt & # remove unneeded disk and mouse drivers [ ! -s /etc/hwinfo.disk ] && rmmod sd_mod 2>/dev/null #grep -q " PS/2 " /etc/hwinfo.mouse || \ @@ -230,7 +230,7 @@ case $1 in # if required and mounting) disk) # if disk action is not disabled (see #470) - disk + [ "x${hw_local_disk}" != "xno" ] && disk ;; # remove unneeded kernel modules finish) diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig index b44d57cf..dcadc70a 100755 --- a/initramfs/stage3-stuff/bin/servconfig +++ b/initramfs/stage3-stuff/bin/servconfig @@ -112,24 +112,24 @@ echo -e "# /etc/hosts - file generated by $0 during OpenSLX stage3\ fe00::0\t\tipv6-localnet\nff00::0\t\tipv6-mcastprefix\nff02::1\ \t\tipv6-allnodes\nff02::2\t\tipv6-allrouters\nff02::3\t\t\ ipv6-allhosts\n" >/mnt/etc/hosts -if [ -n "$domain_name" ]; then - echo -en "$clientip\t" >>/mnt/etc/hosts - for name in $domain_name; do - echo -en "$host_name.$name " >>/mnt/etc/hosts +if [ -n "${domain_name}" ]; then + echo -en "${clientip}\t" >>/mnt/etc/hosts + for name in ${domain_name}; do + echo -en "${host_name}.${name} " >>/mnt/etc/hosts done - echo -e "$host_name" >>/mnt/etc/hosts + echo -e "${host_name}" >>/mnt/etc/hosts else - echo -e "$clientip\t$host_name" >>/mnt/etc/hosts + echo -e "${clientip}\t${host_name}" >>/mnt/etc/hosts fi # set up domainname and resolving rm -rf /mnt/etc/resolv.conf -test -n "$domain_name" && \ +test -n "${domain_name}" && \ echo -e "# /etc/resolv.conf - file generated by\n#\t$0:\n\ -#\t$date\n#options timeout:1 attempts:1 rotate\n\ -search "$domain_name >/mnt/etc/resolv.conf -test -n "$domain_name_servers" && { - for name in $domain_name_servers; do - echo nameserver $name >>/mnt/etc/resolv.conf; +#\t${date}\n#options timeout:1 attempts:1 rotate\n\ +search "${domain_name} >/mnt/etc/resolv.conf +test -n "${domain_name_servers}" && { + for name in ${domain_name_servers}; do + echo nameserver ${name} >>/mnt/etc/resolv.conf; done; } ############################################################################# @@ -145,8 +145,6 @@ config_atd # configuration of cron services - calling distro specific function # config_cron (runlevel links, directories, ...) config_cron -[ "x$crontab_entries" != "x" ] && \ - echo -e "$crontab_entries" >> /mnt/etc/crontab # setup system log services - distro dependent function config_syslog config_syslog diff --git a/initramfs/uclib-rootfs/bin/mkdosfs b/initramfs/uclib-rootfs/bin/mkdosfs new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/uclib-rootfs/bin/mkdosfs @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm index 50d69751..e80c77cf 100644 --- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm +++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm @@ -107,16 +107,16 @@ sub getAttrInfo content_descr => '0 prefer gpl, 1 use the nongpl', default => '0', }, - 'xserver::usexrandr' => { + 'xserver::multihead' => { applies_to_systems => 1, applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), - should the 'xserver'-plugin use the "xrandr" extension of Xorg to - make use of multi-head scenarios and dynamically added displays + should the 'xserver'-plugin configure multi-head setups of Xorg + for different scenarios and dynamically added displays (not implemented yet) End-of-Here - content_regex => qr{^(0|1)$}, - content_descr => '1 xrandr extension, 0 switch off', + content_regex => undef, + content_descr => '', default => '1', }, |