Merge branch 'master' of vcs.fsf.org:fai-configs

diff --git a/class/50-host-classes b/class/50-host-classes
index f77152e075141d0d7ae42ab72f73e2141903a252..1ba7f984a91ec50dfc4169129f4fc6bb62fffe8e 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -47,11 +47,9 @@ case $HOSTNAME in
         ;;
     streamstation*)
         echo "FAIBASE DHCPC SYSADMIN STREAM"
-        nogrub=1
         ;;
     freetop*)
         echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION"
-        nogrub=1
         ;;
 
     *)  

diff --git a/disk_config/FAIBASE b/disk_config/FAIBASE
index 141b6deb36c6028107caa036867309a45056538b..68e0a346e4b6bce96b7fabf14046e9716165f197 100644 (file)
--- a/disk_config/FAIBASE
+++ b/disk_config/FAIBASE
@@ -4,7 +4,7 @@
 
 disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
 
-primary /      18G        ext3  rw,noatime,errors=remount-ro
+primary /      10G        ext3  rw,noatime,errors=remount-ro
 primary /home  100-100%  ext3  rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0"
 primary swap   2G swap  rw                   
 

diff --git a/files/etc/lightdm/lightdm.conf.d/50-fix-users.conf/WORKSTATION b/files/etc/lightdm/lightdm.conf.d/50-fix-users.conf/WORKSTATION
new file mode 100644 (file)
index 0000000..ecbd552
--- /dev/null
+++ b/files/etc/lightdm/lightdm.conf.d/50-fix-users.conf/WORKSTATION
@@ -0,0 +1,3 @@
+[SeatDefaults]
+greeter-hide-users=false
+allow-guest=false

diff --git a/files/etc/lightdm/users.conf/WORKSTATION b/files/etc/lightdm/users.conf/WORKSTATION
new file mode 100644 (file)
index 0000000..e4948a6
--- /dev/null
+++ b/files/etc/lightdm/users.conf/WORKSTATION
@@ -0,0 +1,14 @@
+#
+# User accounts configuration
+#
+# NOTE: If you have AccountsService installed on your system, then LightDM will
+# use this instead and these settings will be ignored
+#
+# minimum-uid = Minimum UID required to be shown in greeter
+# hidden-users = Users that are not shown to the user
+# hidden-shells = Shells that indicate a user cannot login
+#
+[UserList]
+minimum-uid=500
+hidden-users=nobody nobody4 noaccess
+hidden-shells=/bin/false /usr/sbin/nologin

diff --git a/scripts/WORKSTATION/00_fix_users.sh b/scripts/WORKSTATION/00_fix_users.sh
new file mode 100755 (executable)
index 0000000..21b3a41
--- /dev/null
+++ b/scripts/WORKSTATION/00_fix_users.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+fcopy -v /etc/lightdm/users.conf
+fcopy -v /etc/lightdm/lightdm.conf.d/50-fix-users.conf