[debian-lan-devel] [debian-lan] 01/02: Minor fixes and improvements.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 1db18bc45838d834a075a83c4d2be3925d654ad9
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Oct 5 09:58:14 2014 +0200

    Minor fixes and improvements.
---
 debian/README.Debian                          | 3 ++-
 fai/config/files/etc/fai/NFSROOT/FAISERVER    | 2 +-
 fai/config/package_config/DESKTOP             | 3 +--
 fai/config/package_config/DISKLESS_CLIENT     | 5 ++---
 fai/config/scripts/DESKTOP/20-default-desktop | 2 +-
 fai/config/scripts/DISKLESS_CLIENT/10-misc    | 2 +-
 fai/config/scripts/FAISERVER/40-dhcp          | 6 +++---
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 92a4d7d..67e7395 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -31,7 +31,7 @@ Create the CD image in the following way:
 Use live-boot for the fai-cd:
 
     sed -i -r -e "s/^(dracut.*$)/\#\1/" /etc/fai/NFSROOT
-    sed -i -r -e "s/^\#live-boot.*/live-boot/" /etc/fai/NFSROOT
+    sed -i -r -e "s/^\#(live-boot.*)/\1/" /etc/fai/NFSROOT
 
 Adapt the config space to your needs if necessary and create the FAI
 nfsroot:
@@ -52,6 +52,7 @@ are available in /usr/share/debian-lan-config/fai/config/disk_config/.
 
 Then convert the installation with the following commands:
 
+   apt-get install aptitude  # needed for FAI
    aptitude install debian-lan-config  # might be already installed
    aptitude -R install fai-server dialog  # no recommends needed
    mkdir /srv/fai/
diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index 166af75..6d5ecdd 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -2,7 +2,7 @@
 
 PACKAGES aptitude
 
-#sysvinit-core # use this for booting jessie without systemd
+sysvinit-core # use this for booting jessie without systemd
 
 nfs-common fai-nfsroot module-init-tools ssh rdate lshw rpcbind
 rsync lftp less dump reiserfsprogs e2fsprogs usbutils
diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index a800cdf..5dc485d 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -24,8 +24,7 @@ xfce4
 #xfprint4
 
 ## other packages:
-lightdm policykit-1
-#gdm3
+gdm3
 menu
 eog
 evince
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index f2500d8..5ffac1a 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -20,8 +20,7 @@ xfce4
 #task-xfce4-desktop
 
 ## other packages:
-lightdm policykit-1
-#gdm3
+gdm3
 menu
 eog
 evince
@@ -57,7 +56,7 @@ procinfo
 #nullmailer # https://bugs.debian.org/329192
 eject
 locales
-console-common
+console-setup
 pciutils usbutils
 #heirloom-mailx
 mutt
diff --git a/fai/config/scripts/DESKTOP/20-default-desktop b/fai/config/scripts/DESKTOP/20-default-desktop
index e97730c..c5b47a2 100755
--- a/fai/config/scripts/DESKTOP/20-default-desktop
+++ b/fai/config/scripts/DESKTOP/20-default-desktop
@@ -3,4 +3,4 @@
 ## Choose the default desktop:
 
 #$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
-$ROOTCMD update-alternatives --set x-session-manager /usr/bin/xfce4-session
+#$ROOTCMD update-alternatives --set x-session-manager /usr/bin/xfce4-session
diff --git a/fai/config/scripts/DISKLESS_CLIENT/10-misc b/fai/config/scripts/DISKLESS_CLIENT/10-misc
index 60b4cc7..5b89e95 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/10-misc
+++ b/fai/config/scripts/DISKLESS_CLIENT/10-misc
@@ -29,4 +29,4 @@ ainsl -q /etc/pam.d/common-auth "auth    optional        pam_group.so"
 
 ## Choose the default desktop:
 #$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
-$ROOTCMD update-alternatives --set x-session-manager /usr/bin/xfce4-session
+#$ROOTCMD update-alternatives --set x-session-manager /usr/bin/xfce4-session
diff --git a/fai/config/scripts/FAISERVER/40-dhcp b/fai/config/scripts/FAISERVER/40-dhcp
index 0198891..cbeb745 100755
--- a/fai/config/scripts/FAISERVER/40-dhcp
+++ b/fai/config/scripts/FAISERVER/40-dhcp
@@ -88,8 +88,6 @@ class "PXE-clients" {
    max-lease-time  120;
    server-name faiserver;
    next-server faiserver;
-   #filename "fai/pxelinux.0";
-   filename "debian-installer/pxelinux.0";
 }
 
 ## Submit preseed file location to d-i:
@@ -102,6 +100,7 @@ subnet ${SUBNET} netmask ${NETMASK} {
       allow unknown-clients;
       max-lease-time 7200;
       range ${RANGE};
+      filename "debian-installer/pxelinux.0";
       if not exists host-name {
          option host-name = concat("guest",suffix(binary-to-ascii(10,8,".",suffix(leased-address,1)),2));
          ddns-hostname = config-option host-name;
@@ -110,7 +109,7 @@ subnet ${SUBNET} netmask ${NETMASK} {
 }
 
 group {
-
+   filename "fai/pxelinux.0";
    on commit {
         execute("/usr/local/sbin/dhcpd-keytab", host-decl-name);
    }
@@ -130,6 +129,7 @@ echo "}" >> $target/etc/dhcp/dhcpd.conf
 cat >> $target/etc/dhcp/dhcpd.conf <<EOF
 
 group {
+   filename "fai/pxelinux.0";
 
 EOF
 NUM=0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git