Author: krejzi Date: Tue Jun 11 08:49:17 2013 New Revision: 11286 Log: Minor fixes to the bootscripts and cyrus sasl options.
Modified: trunk/BOOK/general.ent trunk/BOOK/postlfs/security/cyrus-sasl.xml trunk/bootscripts/blfs/init.d/bluetooth trunk/bootscripts/blfs/init.d/dhcpd trunk/bootscripts/blfs/init.d/gdm trunk/bootscripts/blfs/init.d/krb5 trunk/bootscripts/blfs/init.d/networkmanager trunk/bootscripts/blfs/init.d/saslauthd trunk/bootscripts/blfs/init.d/slapd Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/BOOK/general.ent Tue Jun 11 08:49:17 2013 (r11286) @@ -3,13 +3,13 @@ $Date$ --> -<!ENTITY day "10"> <!-- Always 2 digits --> +<!ENTITY day "11"> <!-- Always 2 digits --> <!ENTITY month "06"> <!-- Always 2 digits --> <!ENTITY year "2013"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "June 10th, &year;"> +<!ENTITY releasedate "June 11th, &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY lfs-version "development"> <!-- version|testing|unstable|development] --> @@ -68,7 +68,7 @@ <!ENTITY lfs-vim-version "7.3"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20130610"> +<!ENTITY blfs-bootscripts-version "20130611"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.&lfs-domainname;/blfs/wiki";> Modified: trunk/BOOK/postlfs/security/cyrus-sasl.xml ============================================================================== --- trunk/BOOK/postlfs/security/cyrus-sasl.xml Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/BOOK/postlfs/security/cyrus-sasl.xml Tue Jun 11 08:49:17 2013 (r11286) @@ -131,7 +131,8 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dbpath=/var/lib/sasl/sasldb2 \ - --with-saslauthd=/var/run/saslauthd && + --with-saslauthd=/var/run/saslauthd \ + --enable-auth-sasldb && make</userinput></screen> <para> @@ -173,6 +174,11 @@ </para> <para> + <parameter>--enable-auth-sasldb</parameter>: This switch enables + SASLDB authentication backend. + </para> + + <para> <parameter>--with-dblib=gdbm</parameter>: This switch forces <application>GDBM</application> to be used instead of <application>Berkeley DB</application>. Modified: trunk/bootscripts/blfs/init.d/bluetooth ============================================================================== --- trunk/bootscripts/blfs/init.d/bluetooth Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/bluetooth Tue Jun 11 08:49:17 2013 (r11286) @@ -62,6 +62,7 @@ log_info_msg "Starting Bluetooth DUN daemon dund \n" start_daemon /usr/bin/dund "$DUND_OPTIONS" fi + evaluate_retval ;; @@ -88,6 +89,7 @@ log_info_msg "Stopping Bluetooth daemon bluetoothd \n" killproc /usr/sbin/bluetoothd + evaluate_retval ;; Modified: trunk/bootscripts/blfs/init.d/dhcpd ============================================================================== --- trunk/bootscripts/blfs/init.d/dhcpd Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/dhcpd Tue Jun 11 08:49:17 2013 (r11286) @@ -43,6 +43,7 @@ log_info_msg "Starting ISC DHCP Server dhcpd" start_daemon /usr/sbin/dhcpd -q $INTERFACES $OPTIONS + evaluate_retval ;; @@ -50,6 +51,7 @@ log_info_msg "Stopping ISC DHCP Server dhcpd" killproc /usr/sbin/dhcpd + evaluate_retval ;; Modified: trunk/bootscripts/blfs/init.d/gdm ============================================================================== --- trunk/bootscripts/blfs/init.d/gdm Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/gdm Tue Jun 11 08:49:17 2013 (r11286) @@ -24,20 +24,17 @@ GDM_BINARY=/usr/sbin/gdm -if [ -f /etc/profile.d/gnome.sh ]; then - . /etc/profile.d/gnome.sh - GDM_BINARY=${GNOME_PREFIX}/sbin/gdm -fi - case "${1}" in start) log_info_msg "Starting GNOME Display Manager GDM" start_daemon ${GDM_BINARY} + evaluate_retval ;; stop) log_info_msg "Stopping GNOME Display Manager GDM" killproc ${GDM_BINARY} + evaluate_retval ;; restart) Modified: trunk/bootscripts/blfs/init.d/krb5 ============================================================================== --- trunk/bootscripts/blfs/init.d/krb5 Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/krb5 Tue Jun 11 08:49:17 2013 (r11286) @@ -34,6 +34,7 @@ start_daemon /usr/sbin/kadmind log_info_msg "Starting Kerberos database propagation server kpropd" start_daemon /usr/sbin/kpropd -S + evaluate_retval ;; stop) @@ -43,6 +44,7 @@ killproc /usr/sbin/kadmind log_info_msg "Stopping Kerberos KDC krb5kdc" killproc /usr/sbin/krb5kdc + evaluate_retval ;; restart) Modified: trunk/bootscripts/blfs/init.d/networkmanager ============================================================================== --- trunk/bootscripts/blfs/init.d/networkmanager Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/networkmanager Tue Jun 11 08:49:17 2013 (r11286) @@ -35,11 +35,13 @@ log_info_msg "Starting network connection manager NetworkManager" start_daemon /usr/sbin/NetworkManager + evaluate_retval ;; stop) log_info_msg "Stopping network connection manager NetworkManager" killproc /usr/sbin/NetworkManager + evaluate_retval ;; restart) Modified: trunk/bootscripts/blfs/init.d/saslauthd ============================================================================== --- trunk/bootscripts/blfs/init.d/saslauthd Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/saslauthd Tue Jun 11 08:49:17 2013 (r11286) @@ -55,11 +55,13 @@ log_info_msg "Starting SASL Authentication Daemon saslauthd" start_daemon /usr/sbin/saslauthd -a $AUTHMECH $OPTIONS + evaluate_retval ;; stop) log_info_msg "Stopping SASL Authentication Daemon saslauthd" killproc /usr/sbin/saslauthd + evaluate_retval ;; restart) Modified: trunk/bootscripts/blfs/init.d/slapd ============================================================================== --- trunk/bootscripts/blfs/init.d/slapd Tue Jun 11 04:58:49 2013 (r11285) +++ trunk/bootscripts/blfs/init.d/slapd Tue Jun 11 08:49:17 2013 (r11286) @@ -44,11 +44,13 @@ else start_daemon /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS fi + evaluate_retval ;; stop) log_info_msg "Stopping OpenLDAP" killproc /usr/sbin/slapd + evaluate_retval ;; restart) -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
