From 3c7bd008457f2a05bc043f77e307c6a11ad4520c Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Sat, 4 Jun 2016 00:20:40 +0000 Subject: [PATCH] Temporary render fix for bootscripts with REV=systemd. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17430 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/prog/php.xml | 15 +++++++++++-- general/prog/svnserver.xml | 3 ++- multimedia/libdriv/alsa-utils.xml | 5 +++-- networking/connect/dhcp.xml | 19 ++++++++++++---- networking/connect/dhcpcd.xml | 4 ++-- networking/netprogs/bridgeutils.xml | 7 +++++- networking/netprogs/netfs.xml | 5 +++-- networking/netprogs/nfs-utils.xml | 6 ++++-- networking/netprogs/ntp.xml | 3 ++- networking/netprogs/rpcbind.xml | 18 +++++++++++----- networking/netprogs/rsync.xml | 3 ++- networking/netprogs/samba.xml | 3 ++- networking/netprogs/wpa_supplicant.xml | 3 ++- networking/netutils/avahi.xml | 3 ++- networking/netutils/networkmanager.xml | 3 ++- networking/netutils/wicd.xml | 30 ++++++++++++++++++++------ postlfs/config/random.xml | 3 ++- postlfs/filesystems/smartmontools.xml | 3 ++- postlfs/security/cyrus-sasl.xml | 3 ++- postlfs/security/haveged.xml | 3 ++- postlfs/security/iptables.xml | 3 ++- postlfs/security/mitkrb.xml | 3 ++- postlfs/security/openssh.xml | 7 +++--- postlfs/security/stunnel.xml | 15 +++++++++---- pst/printing/cups.xml | 3 ++- server/databases/mariadb.xml | 3 ++- server/databases/postgresql.xml | 3 ++- server/mail/dovecot.xml | 3 ++- server/mail/exim.xml | 3 ++- server/mail/postfix.xml | 3 ++- server/mail/sendmail.xml | 3 ++- server/major/apache.xml | 3 ++- server/major/bind.xml | 3 ++- server/major/proftpd.xml | 3 ++- server/major/vsftpd.xml | 3 ++- server/other/openldap.xml | 3 ++- server/other/unbound.xml | 3 ++- server/other/xinetd.xml | 3 ++- template/template.xml | 3 ++- x/dm/lxdm.xml | 3 ++- x/dm/sddm.xml | 3 ++- 41 files changed, 157 insertions(+), 64 deletions(-) diff --git a/general/prog/php.xml b/general/prog/php.xml index a09b99cb78..f84edcd1a7 100644 --- a/general/prog/php.xml +++ b/general/prog/php.xml @@ -512,7 +512,7 @@ gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz Boot Script - + To automatically start the php-fpm daemon when the system is rebooted, install the /etc/rc.d/init.d/php bootscript from the @@ -520,11 +520,22 @@ gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gzroot user: + + To automatically start the php-fpm daemon when the + system is rebooted, install the php-fpm.service + unit from the package as the + root user: + + + php -make install-php +make install-php + +make install-php-fpm + diff --git a/general/prog/svnserver.xml b/general/prog/svnserver.xml index 6cce5296c4..b88ae10f70 100644 --- a/general/prog/svnserver.xml +++ b/general/prog/svnserver.xml @@ -209,7 +209,8 @@ EOF 4. Starting the Server To start the server at boot time, install the svn bootscript - included in the package. + included in the + package. svn diff --git a/multimedia/libdriv/alsa-utils.xml b/multimedia/libdriv/alsa-utils.xml index 5ad32b369c..d7fc8b21b3 100644 --- a/multimedia/libdriv/alsa-utils.xml +++ b/multimedia/libdriv/alsa-utils.xml @@ -217,8 +217,9 @@ make To automatically store and restore volume settings (if udev rule doesn't work for you) when the system is rebooted, install the - /etc/rc.d/init.d/alsa boot script from the package. + /etc/rc.d/init.d/alsa boot script from the + + package. make install-alsa diff --git a/networking/connect/dhcp.xml b/networking/connect/dhcp.xml index feaf0250ef..ae341a5641 100644 --- a/networking/connect/dhcp.xml +++ b/networking/connect/dhcp.xml @@ -185,7 +185,9 @@ mv -v /usr/sbin/dhclient /sbin && install -v -m755 client/scripts/linux /sbin/dhclient-script - Skip to in order to configure the client + Skip to + + in order to configure the client @@ -234,7 +236,7 @@ install -v -m755 client/scripts/linux /sbin/dhclient-script - + Client Configuration @@ -340,6 +342,12 @@ EOF + + Client Configuration + + TBA + + Server Configuration @@ -394,8 +402,11 @@ EOF If you want to start the DHCP Server at boot, install - the /etc/rc.d/init.d/dhcpd - init script included in the + the /etc/rc.d/init.d/dhcpd + dhcpd.service + init script included in the + + package: diff --git a/networking/connect/dhcpcd.xml b/networking/connect/dhcpcd.xml index eef5d19e5d..f02a70b9fb 100644 --- a/networking/connect/dhcpcd.xml +++ b/networking/connect/dhcpcd.xml @@ -137,7 +137,7 @@ install -v -m 644 dhcpcd-hooks/50-dhcpcd-compat /lib/dhcpcd/dhcpcd-hooks/ - + General Configuration Information To configure dhcpcd, you need to first install @@ -206,7 +206,7 @@ EOF - + Configuration Information: fixed ip Although not usual, it is possible that you need diff --git a/networking/netprogs/bridgeutils.xml b/networking/netprogs/bridgeutils.xml index 12a421dd63..3f338527c8 100644 --- a/networking/netprogs/bridgeutils.xml +++ b/networking/netprogs/bridgeutils.xml @@ -121,7 +121,7 @@ make Configuring bridge-utils - + Configuration Information To automate bridge creation and configuration, @@ -178,6 +178,11 @@ EOF + + Configuration Information + TBA + + diff --git a/networking/netprogs/netfs.xml b/networking/netprogs/netfs.xml index d36bd97994..60bf58352a 100644 --- a/networking/netprogs/netfs.xml +++ b/networking/netprogs/netfs.xml @@ -29,10 +29,11 @@ option, and unmounting of all network filesystems before the network is brought down. - As the root user, install + As the root user, install the /etc/rc.d/init.d/netfs bootscript included with the package. -make install-netfs +make install-netfs + TBA diff --git a/networking/netprogs/nfs-utils.xml b/networking/netprogs/nfs-utils.xml index aa2c339739..2bc4608fec 100644 --- a/networking/netprogs/nfs-utils.xml +++ b/networking/netprogs/nfs-utils.xml @@ -220,7 +220,8 @@ chmod u+w,go+r /sbin/mount.nfs Boot Script Install the /etc/rc.d/init.d/nfs-server - init script included in the package + init script included in the + package to start the server at boot. make install-nfs-server @@ -291,7 +292,8 @@ EOF nfs-server script is installed. Install the /etc/rc.d/init.d/nfs-client init - script included in the package to start + script included in the + package to start the client services at boot. make install-nfs-client diff --git a/networking/netprogs/ntp.xml b/networking/netprogs/ntp.xml index fb823af33f..af5fa19eb5 100644 --- a/networking/netprogs/ntp.xml +++ b/networking/netprogs/ntp.xml @@ -216,7 +216,8 @@ EOF If you choose Option one, then install the /etc/rc.d/init.d/ntp init script included in the - package. + + package. ntp diff --git a/networking/netprogs/rpcbind.xml b/networking/netprogs/rpcbind.xml index 91c8856b52..b1e8687279 100644 --- a/networking/netprogs/rpcbind.xml +++ b/networking/netprogs/rpcbind.xml @@ -91,7 +91,7 @@ Install rpcbind by running the following commands: -patch -Np1 -i ../rpcbind-&rpcbind-version;-tirpc_fix-1.patch && +patch -Np1 -i ../rpcbind-&rpcbind-version;-tirpc_fix-1.patch && ./configure --prefix=/usr \ --bindir=/sbin \ @@ -99,6 +99,13 @@ --without-systemdsystemunitdir && make +patch -Np1 -i ../rpcbind-&rpcbind-version;-tirpc_fix-1.patch && + +./configure --prefix=/usr \ + --bindir=/sbin \ + --with-rpcuser=root && +make + This package does not come with a test suite. Now, as the root user: @@ -113,8 +120,8 @@ make --with-rpcuser=root: This works around an error in the configure script. - --without-systemdsystemunitdir: BLFS does not - support systemd. + --without-systemdsystemunitdir: + BLFS does not support systemd. @@ -124,8 +131,9 @@ make Boot Script - Install the /etc/rc.d/init.d/rpcbind init script - included in the package. + Install the /etc/rc.d/init.d/rpcbind init + script included in the + package. rpcbind diff --git a/networking/netprogs/rsync.xml b/networking/netprogs/rsync.xml index 4b48c42c09..b6e8454093 100644 --- a/networking/netprogs/rsync.xml +++ b/networking/netprogs/rsync.xml @@ -174,7 +174,8 @@ EOF Install the /etc/rc.d/init.d/rsyncd init script included in the - package. + + package. make install-rsyncd diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml index 51e3edb341..b15731baf4 100644 --- a/networking/netprogs/samba.xml +++ b/networking/netprogs/samba.xml @@ -411,7 +411,8 @@ install -v -m755 examples/LDAP/{get*,ol*} \ For your convenience, boot scripts have been provided for Samba. There are two included in the - package. The first, + + package. The first, samba, will start the smbd and nmbd daemons needed to provide SMB/CIFS services. The second script, winbind, starts diff --git a/networking/netprogs/wpa_supplicant.xml b/networking/netprogs/wpa_supplicant.xml index d0cf9e4a52..d81153f492 100644 --- a/networking/netprogs/wpa_supplicant.xml +++ b/networking/netprogs/wpa_supplicant.xml @@ -314,7 +314,8 @@ install -v -m644 wpa_gui-qt4/icons/wpa_gui.svg /usr/share/pixmaps/wpa_supplicant, you need to install the /lib/services/wpa script - included in package: + included in + package: make install-service-wpa diff --git a/networking/netutils/avahi.xml b/networking/netutils/avahi.xml index 4f74558307..9b2f5e0023 100644 --- a/networking/netutils/avahi.xml +++ b/networking/netutils/avahi.xml @@ -245,7 +245,8 @@ make To automatically start the avahi-daemon when the system is rebooted, install the /etc/rc.d/init.d/avahi bootscript from - the package. + the + package. diff --git a/networking/netutils/networkmanager.xml b/networking/netutils/networkmanager.xml index f6d4b371fa..30f9fc3137 100644 --- a/networking/netutils/networkmanager.xml +++ b/networking/netutils/networkmanager.xml @@ -228,7 +228,8 @@ EOF To automatically start the NetworkManager daemon when the system is rebooted, install the /etc/rc.d/init.d/networkmanager bootscript from the - package. + + package. diff --git a/networking/netutils/wicd.xml b/networking/netutils/wicd.xml index 64f1f85805..fdf16a085b 100644 --- a/networking/netutils/wicd.xml +++ b/networking/netutils/wicd.xml @@ -101,9 +101,21 @@ Install Wicd by running the following commands: -sed -e "/wpath.logrotate\|wpath.systemd/d" \ +sed -e "/wpath.logrotate\|wpath.systemd/d" \ -e "/detection failed/ a\ self.init=\'init\/default\/wicd\'" \ - -i.orig setup.py &&; + -i.orig setup.py && + +rm po/*.po && + +python setup.py configure --no-install-kde \ + --no-install-acpi \ + --no-install-pmutils \ + --no-install-init \ + --no-install-gnome-shell-extensions \ + --docdir=/usr/share/doc/wicd-&wicd-version; + +sed "/detection failed/ a\ self.init=\'init\/default\/wicd\'" \ + -i.orig setup.py && rm po/*.po && @@ -126,10 +138,13 @@ python setup.py configure --no-install-kde \ Command Explanations - sed -e ... -i setup.py: The first expression in - this sed command prevents installation of logrotate and - systemd configuration files. You may omit it if you use these utilities. The - second one fixes building with BLFS. + sed -e ... -i setup.py: The first + expression in this sed command prevents installation of + logrotate and systemd configuration files. You may omit it if you use these + utilities. The second one fixes building with BLFS. + + sed -e ... -i setup.py: Fix + and issue while building with BLFS. rm po/*.po: This command removes the international messages associated with this package. The command is required unless Babel @@ -180,7 +195,8 @@ python setup.py configure --no-install-kde \ To automatically start Wicd at boot time, you need to first install the Wicd bootscript, /etc/rc.d/init.d/wicd, - included in the package + included in the + package (as user root): diff --git a/postlfs/config/random.xml b/postlfs/config/random.xml index 8754968263..b8a85e5d22 100644 --- a/postlfs/config/random.xml +++ b/postlfs/config/random.xml @@ -33,7 +33,8 @@ start-ups. Install the /etc/rc.d/init.d/random init script - included with the package. + included with the + package. make install-random diff --git a/postlfs/filesystems/smartmontools.xml b/postlfs/filesystems/smartmontools.xml index 9e9231e182..5b41ecbad1 100644 --- a/postlfs/filesystems/smartmontools.xml +++ b/postlfs/filesystems/smartmontools.xml @@ -116,7 +116,8 @@ make If you want the smartd daemon to start automatically when the system is booted, install the /etc/rc.d/init.d/smartd init script included - in the package. + in the + package. diff --git a/postlfs/security/cyrus-sasl.xml b/postlfs/security/cyrus-sasl.xml index 2bf14bc300..dd37f984df 100644 --- a/postlfs/security/cyrus-sasl.xml +++ b/postlfs/security/cyrus-sasl.xml @@ -273,7 +273,8 @@ install -v -dm700 /var/lib/sasl If you need to run the saslauthd daemon at system startup, install the /etc/rc.d/init.d/saslauthd - init script included in the + init script included in the + package using the following command: diff --git a/postlfs/security/haveged.xml b/postlfs/security/haveged.xml index c47b7ffde0..c73ddf3f04 100644 --- a/postlfs/security/haveged.xml +++ b/postlfs/security/haveged.xml @@ -110,7 +110,8 @@ cp -v README /usr/share/doc/haveged-&haveged-version; If you want the Haveged daemon to start automatically when the system is booted, install the /etc/rc.d/init.d/haveged init script included - in the package. + in the + package. diff --git a/postlfs/security/iptables.xml b/postlfs/security/iptables.xml index 1e40819e98..7912b901d8 100644 --- a/postlfs/security/iptables.xml +++ b/postlfs/security/iptables.xml @@ -203,7 +203,8 @@ done To set up the iptables firewall at boot, install the /etc/rc.d/init.d/iptables init script included - in the package. + in the + package. diff --git a/postlfs/security/mitkrb.xml b/postlfs/security/mitkrb.xml index 00fa45094d..e7897914a0 100644 --- a/postlfs/security/mitkrb.xml +++ b/postlfs/security/mitkrb.xml @@ -449,7 +449,8 @@ EOF If you want to start Kerberos services at boot, install the /etc/rc.d/init.d/krb5 init - script included in the package using + script included in the + package using the following command: diff --git a/postlfs/security/openssh.xml b/postlfs/security/openssh.xml index 13a75f6b96..4c5bdcfb55 100644 --- a/postlfs/security/openssh.xml +++ b/postlfs/security/openssh.xml @@ -313,9 +313,10 @@ echo "UsePAM yes" >> /etc/ssh/sshd_config To start the SSH server at system boot, install the - /etc/rc.d/init.d/sshd init script included - in the package. - + /etc/rc.d/init.d/sshd init script included + in the + package. + sshd diff --git a/postlfs/security/stunnel.xml b/postlfs/security/stunnel.xml index 2bbb46cc4d..3a3e52d788 100644 --- a/postlfs/security/stunnel.xml +++ b/postlfs/security/stunnel.xml @@ -132,12 +132,17 @@ useradd -c "stunnel Daemon" -d /var/lib/stunnel \ ./configure ... in the first command below. -./configure --prefix=/usr \ +./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-systemd && make +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var && +make + This package does not come with a test suite. Now, as the root user: @@ -165,8 +170,9 @@ make Command Explanations - --disable-systemd: This switch disables - systemd socket activation support which is not available in BLFS. + --disable-systemd: This switch + disables systemd socket activation support which is not available in + BLFS. make docdir=... install: This command installs the package and changes the documentation installation directory to standard @@ -253,7 +259,8 @@ connect = <hostname:portnumber>To automatically start the stunnel daemon when the system is booted, install the /etc/rc.d/init.d/stunnel bootscript from the - package. + + package. stunnel diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml index 56028c4956..ba1eb7eeba 100644 --- a/pst/printing/cups.xml +++ b/pst/printing/cups.xml @@ -407,7 +407,8 @@ EOF If you want the Cups print service to start automatically when the system is booted, install the init - script included in the + script included in the + package: diff --git a/server/databases/mariadb.xml b/server/databases/mariadb.xml index 56e0d83508..788ceb11c1 100644 --- a/server/databases/mariadb.xml +++ b/server/databases/mariadb.xml @@ -366,7 +366,8 @@ mysqld_safe --user=mysql 2>&1 >/dev/null & Install the /etc/rc.d/init.d/mysql init script - included in the package as + included in the + package as the root user to start the MariaDB server during system boot-up. diff --git a/server/databases/postgresql.xml b/server/databases/postgresql.xml index 185b064929..371da5bd22 100644 --- a/server/databases/postgresql.xml +++ b/server/databases/postgresql.xml @@ -250,7 +250,8 @@ echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')Install the /etc/rc.d/init.d/postgresql init script included in the - package. + + package. postgresql diff --git a/server/mail/dovecot.xml b/server/mail/dovecot.xml index 4a8af957f3..192e2e139c 100644 --- a/server/mail/dovecot.xml +++ b/server/mail/dovecot.xml @@ -248,7 +248,8 @@ EOF If you want the Dovecot server to start automatically when the system is booted, install the /etc/rc.d/init.d/dovecot init script included - in the package. + in the + package. dovecot diff --git a/server/mail/exim.xml b/server/mail/exim.xml index 8f7955a869..78e2a5660e 100644 --- a/server/mail/exim.xml +++ b/server/mail/exim.xml @@ -304,7 +304,8 @@ exim -v -bi && To automate the running of exim at startup, install the /etc/rc.d/init.d/exim init script - included in the + included in the + package. diff --git a/server/mail/postfix.xml b/server/mail/postfix.xml index dcbf3a079b..408b3aa9a7 100644 --- a/server/mail/postfix.xml +++ b/server/mail/postfix.xml @@ -406,7 +406,8 @@ EOF To automate the running of Postfix at startup, install the /etc/rc.d/init.d/postfix init script included in - the package. + the + package. diff --git a/server/mail/sendmail.xml b/server/mail/sendmail.xml index 6f475fadff..3f12e43774 100644 --- a/server/mail/sendmail.xml +++ b/server/mail/sendmail.xml @@ -265,7 +265,8 @@ m4 m4/cf.m4 sendmail.mc > sendmail.cf To automate the running of sendmail at startup, install the /etc/rc.d/init.d/sendmail init script included in the - package. + + package. sendmail diff --git a/server/major/apache.xml b/server/major/apache.xml index a26100e1a2..6dc9540b09 100644 --- a/server/major/apache.xml +++ b/server/major/apache.xml @@ -273,7 +273,8 @@ chown -v -R apache:apache /srv/www If you want the Apache server to start automatically when the system is booted, install the /etc/rc.d/init.d/httpd init script included - in the package. + in the + package. diff --git a/server/major/bind.xml b/server/major/bind.xml index f12eeaa8f1..2216717103 100644 --- a/server/major/bind.xml +++ b/server/major/bind.xml @@ -408,7 +408,8 @@ EOF To start the DNS server at boot, install the /etc/rc.d/init.d/bind init script included - in the package. + in the + package. bind diff --git a/server/major/proftpd.xml b/server/major/proftpd.xml index 1c7cea9942..34ba417323 100644 --- a/server/major/proftpd.xml +++ b/server/major/proftpd.xml @@ -235,7 +235,8 @@ EOF Boot Script Install the /etc/rc.d/init.d/proftpd init - script included in the + script included in the + package. diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml index 08d5632e32..485ed3def3 100644 --- a/server/major/vsftpd.xml +++ b/server/major/vsftpd.xml @@ -184,7 +184,8 @@ EOF Install the /etc/rc.d/init.d/vsftpd init script included in the - package. + + package. make install-vsftpd diff --git a/server/other/openldap.xml b/server/other/openldap.xml index de1e857e56..179116de55 100644 --- a/server/other/openldap.xml +++ b/server/other/openldap.xml @@ -415,7 +415,8 @@ cp -vfr doc/{drafts,rfc,guide} \ To automate the startup of the LDAP server at system bootup, install the /etc/rc.d/init.d/slapd init script - included in the package + included in the + package using the following command: diff --git a/server/other/unbound.xml b/server/other/unbound.xml index f5d6614152..0d11e904e4 100644 --- a/server/other/unbound.xml +++ b/server/other/unbound.xml @@ -232,7 +232,8 @@ install -v -m644 doc/html/* /usr/share/doc/unbound-&unbound-version; If you want the Unbound server to start automatically when the system is booted, install the /etc/rc.d/init.d/unbound init script included - in the package. + in the + package. unbound diff --git a/server/other/xinetd.xml b/server/other/xinetd.xml index 69a22773a6..6c5546fef3 100644 --- a/server/other/xinetd.xml +++ b/server/other/xinetd.xml @@ -400,7 +400,8 @@ EOF As the root user, install the /etc/rc.d/init.d/xinetd init script included in - the package. + the + package. xinetd diff --git a/template/template.xml b/template/template.xml index c997976d76..fc8cbdb5d3 100644 --- a/template/template.xml +++ b/template/template.xml @@ -278,7 +278,8 @@ EOF To automatically start the TEMPLATE daemon when the system is rebooted, install the /etc/rc.d/init.d/TEMPLATE bootscript from the - package as the + + package as the root user: diff --git a/x/dm/lxdm.xml b/x/dm/lxdm.xml index cb26c5b592..c871160f6e 100644 --- a/x/dm/lxdm.xml +++ b/x/dm/lxdm.xml @@ -212,7 +212,8 @@ make Install the /etc/rc.d/init.d/lxdm init script from - the package. + the + package. diff --git a/x/dm/sddm.xml b/x/dm/sddm.xml index 121ca8da75..08c276c750 100644 --- a/x/dm/sddm.xml +++ b/x/dm/sddm.xml @@ -287,7 +287,8 @@ install -v -dm755 -o sddm -g sddm /var/lib/sddm Install the /etc/rc.d/init.d/sddm init script from - the package. + the + package.