Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/appendices/dependencies/common.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -31,4 +31,32 @@
+
+ Attr
+
+
+ &dependencies;
+
+
+ Autoconf, Automake, Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+ Libtool, Make and Sed
+
+
+
+
+ &testsuites;
+
+
+ No testsuite available
+
+
+
+
+ &before;
+
+
+ Libcap
+
+
+
Autoconf
@@ -254,4 +282,32 @@
+
+ D-Bus
+
+
+ &dependencies;
+
+
+ Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+ Gettext, Grep, Make, Man, Pkg-config, Sed and Texinfo
+
+
+
+
+ &testsuites;
+
+
+ None
+
+
+
+
+ &before;
+
+
+ systemd
+
+
+
DejaGNU
@@ -364,4 +420,32 @@
+
+ Expat
+
+
+ &dependencies;
+
+
+ Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
+ Make and Sed
+
+
+
+
+ &testsuites;
+
+
+ None
+
+
+
+
+ &before;
+
+
+ D-Bus
+
+
+
Expect
@@ -836,4 +920,31 @@
+
+ Libcap
+
+
+ &dependencies;
+
+
+ Attr, Bash, Binutils, Coreutils, EGLIBC, GCC, Grep and Make
+
+
+
+
+ &testsuites;
+
+
+ No testsuite available
+
+
+
+
+ &before;
+
+
+ systemd
+
+
+
Libtool
@@ -999,5 +1110,5 @@
- None
+ D-Bus
@@ -1222,5 +1333,5 @@
- Util-linux, E2fsprogs
+ E2fsprogs, Pkg-config, systemd, Util-linux
@@ -1393,4 +1504,32 @@
+
+ systemd
+
+
+ &dependencies;
+
+
+ Bash, Binutils, Coreutils, D-Bus, EGLIBC, Findutils, Gawk, GCC,
+ Grep, Libcap, Make, Pkg-config, Sed, Udev and Util-linux
+
+
+
+
+ &testsuites;
+
+
+ No testsuite available
+
+
+
+
+ &before;
+
+
+ None
+
+
+
Sysvinit
@@ -1528,5 +1667,5 @@
- None
+ systemd
@@ -1556,5 +1695,5 @@
- E2fsprogs
+ E2fsprogs, systemd
@@ -1639,5 +1778,5 @@
- File, Module-Init-Tools and Util-linux
+ Binutils, File, Module-Init-Tools and Util-linux
Index: BOOK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/alpha-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -25,5 +25,4 @@
-
Index: OK/boot/common/bootscripts.xml
===================================================================
--- BOOK/boot/common/bootscripts.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ (revision )
@@ -1,64 +1,0 @@
-
-
- %general-entities;
-]>
-
-
-
-
- Bootscripts for CLFS &bootscripts-clfs-version;
-
-
- Bootscripts
- boot
-
-
-
-
-
- Installation of Bootscripts
-
-
-
-make DESTDIR=${CLFS} install-minimal
-
-
-
- If you do not know whether or not the hardware clock is set to UTC,
- you can find out after you have booted the new machine by running the
- hwclock --localtime --show command, and if
- necessary editing the /etc/sysconfig/clock script.
- The worst that will happen if you make a wrong guess here is that the
- time displayed will be wrong.
-
-
-
-cat > ${CLFS}/etc/sysconfig/clock << "EOF"
-# Begin /etc/sysconfig/clock
-
-UTC=1
-
-# End /etc/sysconfig/clock
-EOF
-
-
-
-
-
-
- Details on this package are located in
-
-
-
-
Index: BOOK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/common/devices.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -35,11 +35,23 @@
the following commands:
-mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3
+mknod -m 0600 ${CLFS}/dev/console c 5 1
+mknod -m 0666 ${CLFS}/dev/null c 1 3
+mknod -m 0666 ${CLFS}/dev/zero c 1 5
- Before udev starts a tmpfs filesystem is mounted over /dev and the previous entries are no-longer available. The folling command creates files that are copied over by the udev bootscript:
+ When systemd starts a tmpfs filesystem is mounted over
+ /dev and the previous entries are
+ no-longer available. The folling command creates files that are copied
+ over when udevd starts:
-mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
-mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3
+mkdir -pv ${CLFS}/lib/udev/devices/{pts,shm}
+mknod -m 0600 ${CLFS}/lib/udev/devices/console c 5 1
+mknod -m 0666 ${CLFS}/lib/udev/devices/null c 1 3
+mknod -m 0666 ${CLFS}/lib/udev/devices/zero c 1 5
+mknod -m 0600 ${CLFS}/lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd ${CLFS}/lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 ${CLFS}/lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 ${CLFS}/lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 ${CLFS}/lib/udev/devices/stderr
+ln -snvf /proc/kcore ${CLFS}/lib/udev/devices/core
Index: BOOK/boot/common/pwdgroup.xml
===================================================================
--- BOOK/boot/common/pwdgroup.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/common/pwdgroup.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -45,4 +45,5 @@
cat > ${CLFS}/etc/passwd << "EOF"
root:x:&uid-root;:&gid-root;:root:/root:/bin/bash
+messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false
EOF
@@ -131,5 +132,6 @@
utmp:x:&gid-utmp;:
usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:
EOF
Index: BOOK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/common/sysvinit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -111,11 +111,3 @@
-
-
-
- Details on this package are located in
-
-
-
Index: BOOK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/mips-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -26,5 +26,4 @@
-
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/mips64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -27,5 +27,4 @@
-
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/mips64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -27,5 +27,4 @@
-
Index: BOOK/boot/multilib/sysvinit.xml
===================================================================
--- BOOK/boot/multilib/sysvinit.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/multilib/sysvinit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -52,11 +52,3 @@
xpointer="xpointer(//*[@role='configuration'])"/>
-
-
-
- Details on this package are located in
-
-
-
Index: BOOK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/ppc-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -27,5 +27,4 @@
-
Index: BOOK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/ppc64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -28,5 +28,4 @@
-
Index: BOOK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/sparc-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -26,5 +26,4 @@
-
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/sparc64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -27,5 +27,4 @@
-
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/sparc64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -27,5 +27,4 @@
-
Index: BOOK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/x86-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -25,5 +25,4 @@
-
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/x86_64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -26,5 +26,4 @@
-
Index: BOOK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/boot/x86_64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -26,5 +26,4 @@
-
Index: BOOK/bootscripts/alpha-chapter.xml
===================================================================
--- BOOK/bootscripts/alpha-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/alpha-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: OK/bootscripts/common/bootscripts.xml
===================================================================
--- BOOK/bootscripts/common/bootscripts.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ (revision )
@@ -1,278 +1,0 @@
-
-
- %general-entities;
-]>
-
-
-
-
- Bootscripts for CLFS &bootscripts-clfs-version;
-
-
- Bootscripts
-
-
-
-
-
- The Bootscripts package contains a set of scripts to
- start/stop the CLFS system at bootup/shutdown.
-
-
-
-
- Installation of Bootscripts
-
- Install the package:
-
-make install-bootscripts
-
- You can will need to run the following command to install support for Networking:
-
-make install-network
-
-
-
-
- Contents of Bootscripts
-
-
- Installed scripts
-
-
- checkfs, cleanfs, console, functions, halt, ifdown,
- ifup, localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals,
- setclock, static, swap, sysklogd, template, and udev.
-
-
-
-
- Short Descriptions
-
-
-
-
- checkfs
-
- Checks the integrity of the file systems before they are
- mounted (with the exception of journal and network based file
- systems)
-
- checkfs
-
-
-
-
-
- cleanfs
-
- Removes files that should not be preserved between reboots,
- such as those in /var/run/
- and /var/lock/; it re-creates
- /var/run/utmp and removes the possibly present
- /etc/nologin, /fastboot,
- and /forcefsck files
-
- cleanfs
-
-
-
-
-
- console
-
- Loads the correct keymap table for the desired keyboard
- layout; it also sets the screen font
-
- console
-
-
-
-
-
- functions
-
- Contains common functions, such as error and status checking,
- that are used by several bootscripts
-
- functions
-
-
-
-
-
- halt
-
- Halts the system
-
- halt
-
-
-
-
-
- ifdown
-
- Assists the network script with stopping network devices
-
- ifdown
-
-
-
-
-
- ifup
-
- Assists the network script with starting network devices
-
- ifup
-
-
-
-
-
- localnet
-
- Sets up the system's hostname and local loopback device
-
- localnet
-
-
-
-
-
- mountfs
-
- Mounts all file systems, except ones that are marked
- noauto or are network based
-
- mountfs
-
-
-
-
-
- mountkernfs
-
- Mounts virtual kernel file systems, such as
- proc
-
- mountkernfs
-
-
-
-
-
- network
-
- Sets up network interfaces, such as network cards, and sets up
- the default gateway (where applicable)
-
- network
-
-
-
-
-
- rc
-
- The master run-level control script; it is responsible for
- running all the other bootscripts one-by-one, in a sequence
- determined by the name of the symbolic links being processed
-
- rc
-
-
-
-
-
- reboot
-
- Reboots the system
-
- reboot
-
-
-
-
-
- sendsignals
-
- Makes sure every process is terminated before the system reboots
- or halts
-
- sendsignals
-
-
-
-
-
- setclock
-
- Resets the kernel clock to local time in case the hardware clock
- is not set to UTC time
-
- setclock
-
-
-
-
-
- static
-
- Provides the functionality needed to assign a static Internet
- Protocol (IP) address to a network interface
-
- static
-
-
-
-
-
- swap
-
- Enables and disables swap files and partitions
-
- swap
-
-
-
-
-
- sysklogd
-
- Starts and stops the system and kernel log daemons
-
- sysklogd
-
-
-
-
-
- template
-
- A template to create custom bootscripts for other
- daemons
-
- template
-
-
-
-
-
- udev
-
- Starts and stops the Udev daemon
-
- udev
-
-
-
-
-
-
-
-
-
Index: BOOK/bootscripts/common/console.xml
===================================================================
--- BOOK/bootscripts/common/console.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/common/console.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -14,27 +14,31 @@
configuring
- This section discusses how to configure the i18n
- bootscript that sets up the keyboard map and the console font. If non-ASCII
- characters (e.g., the British pound sign and Euro character) will not be
- used and the keyboard is a U.S. one, skip this section. Without the
- configuration file, the console bootscript will do
- nothing.
+ This section discusses how to configure the
+ vconsole.conf file that sets up the keyboard map and the
+ console font. If non-ASCII characters (e.g., the British pound sign and Euro
+ character) will not be used and the keyboard is most likely a U.S. one. The
+ defaults in the file will probably be suitable for you.
- The i18n script reads the
- /etc/sysconfig/i18n file for configuration
- information. Decide which keymap and screen font will be used. Various
- language-specific HOWTO's can also help with this (see . A pre-made
- /etc/sysconfig/i18n file with known settings for
- several countries was installed with the CLFS-Bootscripts package, so the
- relevant section can be uncommented if the country is supported. If still
- in doubt, look in the /usr/share/consolefonts
- for valid screen fonts and /usr/share/keymaps
- for valid keymaps.
+ The vconsole.conf file is read by the init system
+ and applied on startup. Decide which keymap and screen font will be used.
+ Various language-specific HOWTO's can also help with this (see
+ . Look in
+ /usr/share/consolefonts for valid
+ screen fonts and /usr/share/keymaps for
+ valid keymaps.
- The default /etc/sysconfig/i18n is set up for UTF-8
- using the us keymap. You will need to edit the file to your specific needs.
- The /etc/sysconfig/i18n file has additional information
- in it to help you to assist in configuring.
+ The default /etc/vconsole.conf is set up for a us
+ keymap. You will need to edit the file to your specific needs. The
+ vconsole.conf man page has some information about
+ additional configuration options you may need or want.
+
+cat > /etc/vconsole.conf << "EOF"
+# Begin /etc/vconsole.conf
+
+KEYMAP=us
+FONT=drdos8x16
+
+# End /etc/vconsole.conf
+EOF
Index: BOOK/bootscripts/common/introduction.xml
===================================================================
--- BOOK/bootscripts/common/introduction.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/common/introduction.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -11,18 +11,7 @@
Introduction
- This chapter details how to install and configure the CLFS-Bootscripts
- package. Most of these scripts will work without modification, but a few
- require additional configuration files because they deal with
- hardware-dependent information.
-
- System-V style init scripts are employed in this book because they
- are widely used. For additional options, a hint detailing the BSD style
- init setup is available at .
- Searching the LFS mailing lists for depinit
will also offer
- additional choices.
-
- If using an alternative style of init scripts, skip this chapter and
- move on to .
+ This chapter details how to finish configuring the base system.
+ Including some final configuration for systemd and as well as locales and a
+ simple bash profile that should be suitable for most users.
Index: BOOK/bootscripts/common/locale.xml
===================================================================
--- BOOK/bootscripts/common/locale.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/common/locale.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -11,10 +11,14 @@
- /etc/profile
+ /etc/locale.conf
- The base /etc/profile below sets some
- environment variables necessary for native language support. Setting
- them properly results in:
+ The file /etc/locale.conf file configures
+ system-wide locale settings. The basic file format of locale.conf is a
+ newline-separated list of variable assignments. It is possible to source this
+ configuration file from shell scripts, but it should never contain any shell
+ script features beyond variable assignments. The
+ locale.conf man page contains information about the
+ function of this file. Setting up this file properly results in:
@@ -39,12 +43,8 @@
- This script also sets the INPUTRC environment variable
- that makes Bash and Readline use the /etc/inputrc file
- created earlier.
-
Replace [ll] below with the
two-letter code for the desired language (e.g., en
) and
[CC] with the two-letter code for the
- appropriate country (e.g., GB
).
+ appropriate country (e.g., GB
or US
).
[charmap] should be replaced with the
canonical charmap for your chosen locale.
@@ -72,5 +72,5 @@
This results in a final locale setting of en_US.UTF-8
.
It is important that the locale found using the heuristic above is tested prior
- to it being added to the Bash startup files:
+ to it being added to /etc/locale.conf:
LC_ALL=[locale name] locale country
@@ -113,13 +113,12 @@
Once the proper locale settings have been determined, create the
- /etc/profile file:
+ /etc/locale.conf file:
-cat > /etc/profile << "EOF"
-# Begin /etc/profile
+cat > /etc/locale.conf << "EOF"
+# Begin /etc/locale.conf
-export LANG=[ll]_[CC].[charmap]
-export INPUTRC=/etc/inputrc
+LANG=[ll]_[CC].[charmap]
-# End /etc/profile
+# End /etc/locale.conf
EOF
Index: BOOK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/common/profile.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -38,7 +38,19 @@
The files /etc/profile and
~/.bash_profile are read when the shell is
- invoked as an interactive login shell. In the next section, a base
- /etc/profile will be created to set up locale
- information.
+ invoked as an interactive login shell. Create a base
+ /etc/profile that will setup locale information and load
+ any bash auto completion files that may be on the system. This script also
+ sets the INPUTRC environment variable that makes Bash and
+ Readline use /etc/inputrc.
+
+cat > /etc/profile << "EOF"
+# Begin /etc/profile
+
+source /etc/locale.conf
+for f in /etc/bash_completion.d/*.sh; do source $f; done; unset f
+export INPUTRC=/etc/inputrc
+
+# End /etc/profile
+EOF
Index: OK/bootscripts/common/setclock.xml
===================================================================
--- BOOK/bootscripts/common/setclock.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ (revision )
@@ -1,56 +1,0 @@
-
-
- %general-entities;
-]>
-
-
-
-
- Configuring the setclock Script
-
-
- setclock
- configuring
-
- The setclock script reads the time from the
- hardware clock, also known as the BIOS or the Complementary Metal Oxide
- Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
- script will convert the hardware clock's time to the local time using
- the /etc/localtime file (which tells the
- hwclock program which timezone the user is in). There
- is no way to detect whether or not the hardware clock is set to UTC, so
- this needs to be configured manually.
-
- If you cannot remember whether or not the hardware clock is set
- to UTC, find out by running the hwclock --localtime
- --show command. This will display what the current time is
- according to the hardware clock. If this time matches whatever your
- watch says, then the hardware clock is set to local time. If the output
- from hwclock is not local time, chances are it is set
- to UTC time. Verify this by adding or subtracting the proper amount of
- hours for the timezone to the time shown by hwclock.
- For example, if you are currently in the MST timezone, which is also
- known as GMT -0700, add seven hours to the local time.
-
- Change the value of the UTC variable below
- to a value of (zero) if the hardware clock
- is not set to UTC time.
-
- Create a new file /etc/sysconfig/clock by running
- the following:
-
-cat > /etc/sysconfig/clock << "EOF"
-# Begin /etc/sysconfig/clock
-
-UTC=1
-
-# End /etc/sysconfig/clock
-EOF
-
- A good hint explaining how to deal with time on CLFS is available
- at . It explains issues such as
- time zones, UTC, and the TZ environment variable.
-
-
Index: BOOK/bootscripts/common/usage.xml
===================================================================
--- BOOK/bootscripts/common/usage.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/common/usage.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -9,10 +9,14 @@
- How Do These Bootscripts Work?
+ How does systemd work?
- Bootscripts
+ systemd usage
usage
+
+ Please disregard this page until it can be written.
+
+
Index: BOOK/bootscripts/mips-chapter.xml
===================================================================
--- BOOK/bootscripts/mips-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/mips-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/mips64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/mips64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/mips64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/ppc-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/ppc-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/ppc64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/sparc-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/sparc-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/sparc64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/sparc64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/x86-chapter.xml
===================================================================
--- BOOK/bootscripts/x86-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/x86-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/x86_64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/bootscripts/x86_64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -6,14 +6,13 @@
]>
-
+
- Setting Up System Bootscripts
+ Setting Up the System
-
-
+
Index: BOOK/chroot/common/pwdgroup.xml
===================================================================
--- BOOK/chroot/common/pwdgroup.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/chroot/common/pwdgroup.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -44,4 +44,5 @@
cat > /etc/passwd << "EOF"
root:x:&uid-root;:&gid-root;:root:/root:/bin/bash
+messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false
EOF
@@ -73,5 +74,6 @@
utmp:x:&gid-utmp;:
usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:
EOF
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/alpha-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/common/attr.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,117 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Attr-&attr-version;
+
+
+ Attr
+
+
+
+
+
+ Attr is a library for getting and setting POSIX.1e
+ (formerly POSIX 6) draft 15 capabilities.
+
+
+
+
+ Installation of Attr
+
+ Prepare Attr for compilation:
+
+./configure --prefix=/usr \
+ --libdir=/lib --libexecdir=/usr/lib
+
+ Compile the package:
+
+make
+
+ This package does not come with a test suite.
+
+ Install the package:
+
+make install install-dev install-lib
+
+ Remove extra symlinks:
+
+rm -v /lib/libattr.{,l}a
+
+ Set the proper permissions on the library:
+
+chmod 755 -v /lib/libattr.so.1.1.0
+
+
+
+
+ Contents of Attr
+
+
+ Installed programs
+ Installed libraries
+ Installed directories
+
+
+ attr, getfattr, setfattr
+ libattr.[a,so]
+ /usr/include/attr
+
+
+
+
+ Short Descriptions
+
+
+
+
+ attr
+
+ Manage extended attributes on filesystem objects
+
+ attr
+
+
+
+
+
+ getfattr
+
+ Get extended attributes of filesystem objects
+
+ getfattr
+
+
+
+
+
+ setfattr
+
+ Set extended attributes of filesystem objects
+
+ setfattr
+
+
+
+
+
+ libattr
+
+ Library to manage extended attributes on filesystem objects
+
+ libattr
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/common/coreutils.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -88,13 +88,4 @@
mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
mv -v /usr/bin/chroot /usr/sbin
-
- Other Coreutils programs are used by some of the scripts
- in the CLFS-Bootscripts package. As /usr may not be available during the early
- stages of booting, those binaries need to be on the root partition:
-
-mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin
Index: BOOK/final-system/common/dbus.xml
===================================================================
--- BOOK/final-system/common/dbus.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/common/dbus.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,141 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ D-Bus-&dbus-version;
+
+
+ D-Bus
+
+
+
+
+
+ D-Bus is a message bus system, a simple way for applications
+ to talk to one another.
+
+
+
+
+ Installation of D-Bus
+
+ Prepare Vim for compilation:
+
+./configure --prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
+ --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system
+
+ Compile the package:
+
+make
+
+ This package does not come with a test suite.
+
+ Install the package:
+
+make install
+
+
+
+
+ Contents of D-Bus
+
+
+ Installed programs
+ Installed libraries
+ Installed directories
+
+
+ dbus-cleanup-sockets, dbus-daemon, dbus-uuidgen, dbus-monitor, dbus-launch, dbus-send
+ libdbus-1.[a,so]
+ /etc/dbus-1, /usr/lib/dbus-1.0,
+ /usr/share/dbus-1, /var/lib/dbus
+
+
+
+
+ Short Descriptions
+
+
+
+
+ dbus-cleanup-sockets
+
+ Cleans up leftover sockets in a directory
+
+ dbus-cleanup-sockets
+
+
+
+
+
+ dbus-daemon
+
+ The message bus daemon
+
+ dbus-daemon
+
+
+
+
+
+ dbus-uuidgen
+
+ Utility to generate UUIDs
+
+ dbus-uuidgen
+
+
+
+
+
+ dbus-monitor
+
+ A debug probe that prints message bus messages
+
+ dbus-monitor
+
+
+
+
+
+ dbus-launch
+
+ Utility to start a message bus from a shell script
+
+ dbus-launch
+
+
+
+
+
+ dbus-send
+
+ Send a message to a message bus
+
+ dbus-send
+
+
+
+
+
+ libdbus-1
+
+ Library containing the API for using the message bus
+
+ libdbus-1
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/common/expat.xml
===================================================================
--- BOOK/final-system/common/expat.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/common/expat.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,95 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Expat-&expat-version;
+
+
+ Expat
+
+
+
+
+
+ Expat is a stream-oriented XML parser library written in C.
+
+
+
+
+ Installation of Expat
+
+ Prepare Expat for compilation:
+
+./configure --prefix=/usr
+
+ Compile the package:
+
+make
+
+ To test the results, issue:
+ make check.
+
+ Install the package:
+
+make install
+
+ Install the documentation:
+
+install -v -m755 -d /usr/share/doc/expat-&expat-version;
+install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;
+
+
+
+
+
+ Contents of Expat
+
+
+ Installed program
+ Installed library
+ Installed directory
+
+
+ xmlwf
+ libexpat.[so,a]
+ /usr/share/doc/expat-&expat-version;
+
+
+
+
+ Short Descriptions
+
+
+
+
+ xmlwf
+
+ is a non-validating utility to check whether or not XML
+ documents are well formed
+
+ xmlwf
+
+
+
+
+
+ libexpat
+
+ contains API functions for parsing XML
+
+ libexpat
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/common/kbd.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -40,10 +40,9 @@
make install
- Some of the programs from Kbd are used by scripts
- in the CLFS-Bootscripts package. As /usr may not be available during the early
- stages of booting, those binaries need to be on the root partition:
-
-mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont} /bin
+ Some of the programs from Kbd are used by systemd to
+ initialize the system, those binaries need to be on the root
+ partition:
+
+mv -v /usr/bin/{loadkeys,setfont} /bin
Index: BOOK/final-system/common/libcap.xml
===================================================================
--- BOOK/final-system/common/libcap.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/common/libcap.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,117 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Libcap-&libcap-version;
+
+
+ Libcap
+
+
+
+
+
+ Libcap is a library for getting and setting POSIX.1e
+ (formerly POSIX 6) draft 15 capabilities.
+
+
+
+
+ Installation of Libcap
+
+ Compile the package:
+
+make
+
+ This package does not come with a test suite.
+
+ Install the package:
+
+make lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;
+rm /lib/libcap.so
+ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so
+mv -v /lib/libcap.a /usr/lib
+
+
+
+
+ Contents of Libcap
+
+
+ Installed programs
+ Installed libraries
+
+
+ capsh, setcap, getpcaps, getcap
+ libcap.[a,so]
+
+
+
+
+ Short Descriptions
+
+
+
+
+ capsh
+
+ Capability support and use can be explored and constrained
+ with this tool
+
+ capsh
+
+
+
+
+
+ setcap
+
+ Sets file capabilities
+
+ setcap
+
+
+
+
+
+ getpcaps
+
+ Displays the capabilities on the queried process(es)
+
+ getpcaps
+
+
+
+
+
+ getcap
+
+ Wxamines file capabilities
+
+ getcap
+
+
+
+
+
+ libcap
+
+ Library for setting and clearing POSIX.1e capabilities
+
+ libcap
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/common/systemd.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,226 @@
+
+
+ %general-entities;
+]>
+
+
+
+ systemd-&systemd-version;
+
+
+ systemd
+
+
+
+
+
+ systemd is a system and service manager for Linux
+ operating systems.
+
+
+
+
+ Installation of systemd
+
+ By default, systemd contains a unit file
+ that mounts a tmpfs over /var/lock on boot as 775 with a gid of lock. CLFS
+ does not have a lock group. Change this to 777 with the following
+ command:
+
+sed -i "s/\(mode\)=775,gid=lock/\1=777/" \
+ units/var-lock.mount
+
+ Prepare systemd for compilation:
+
+./configure --prefix=/usr \
+ --sysconfdir=/etc --localstatedir=/var \
+ --with-rootdir= --with-distro=other \
+ --with-syslog-service=rsyslog.service \
+ --with-sysvinit-path=/etc/init.d \
+ --with-sysvrcd-path=/etc/rc.d
+
+ Compile the package:
+
+make
+
+ Install the package:
+
+make install
+
+
+
+
+ Configuring systemd
+
+
+ systemd
+ configuring
+
+
+ /etc/os-release
+
+
+ Create a file to identify the operating system.
+ systemd will use this file on boot to put information
+ on the screen.
+
+cat > /etc/os-release << "EOF"
+# Begin /etc/os-release
+
+NAME=Cross-LFS
+ID=clfs
+
+PRETTY_NAME=Cross Linux From Scratch
+ANSI_COLOR=0;33
+
+VERSION=&version;
+VERSION_ID=&versionid;
+
+# End /etc/os-release
+EOF
+
+
+
+
+ Contents of systemd
+
+
+ Installed programs
+ Installed libraries
+ Installed directories
+
+
+ systemctl, systemd, systemd-ask-password, systemd-cgls,
+ systemd-notify, systemd-tty-ask-password-agent
+ pam_systemd
+ /lib/systemd, /etc/systemd, /etc/tmpfiles.d,
+ /usr/share/systemd
+
+
+
+
+ Short Descriptions
+
+
+
+
+ systemctl
+
+ Control the systemd system and service manager
+
+ systemctl
+
+
+
+
+
+ systemd
+
+ System and service manager for Linux
+
+ systemd
+
+
+
+
+
+ systemd-ask-password
+
+ Queries the user for a system passphrase, via the
+ TTY or an UI agent.
+
+ systemd-ask-password
+
+
+
+
+
+ systemd-cgls
+
+ Recursively shows control group contents
+
+ systemd-cgls
+
+
+
+
+
+ systemd-notify
+
+ Notify init system about start-up completion and other daemon
+ status changes
+
+ systemd-notify
+
+
+
+
+
+ systemd-tty-ask-password-agent
+
+ Process system password requests
+
+ systemd-tty-ask-password-agent
+
+
+
+
+
+ pam_systemd
+
+ Register user sessions in the systemd control group
+ hierarchy
+
+ pam_systemd
+
+
+
+
+
+ /lib/systemd
+
+ Location of system units and configurations
+
+ /lib/systemd
+
+
+
+
+
+ /etc/systemd
+
+ Location of user units and configurations
+
+ /etc/systemd
+
+
+
+
+
+ /etc/tmpfiles.d
+
+ Configuration for creation, deletion and cleaning of temporary
+ and volatile files
+
+ /etc/tmpfiles.d
+
+
+
+
+
+ /usr/share/systemd
+
+ Location of session unit files
+
+ /usr/share/systemd
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/common/udev.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -30,5 +30,6 @@
./configure --prefix=/usr \
--exec-prefix="" --sysconfdir=/etc \
- --libexecdir=/lib/udev --libdir=/usr/lib \
+ --sbindir=/sbin --libexecdir=/lib/udev \
+ --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
--disable-extras --disable-introspection
@@ -45,4 +46,25 @@
install -dv /lib/firmware
+
+
+
+
+ Configuring Udev
+
+ When systemd starts a tmpfs filesystem is mounted over
+ /dev and the previous entries are
+ no-longer available. The folling command creates files that are copied
+ over when udevd starts:
+
+mkdir -pv /lib/udev/devices/{pts,shm}
+mknod -m 0600 /lib/udev/devices/console c 5 1
+mknod -m 0666 /lib/udev/devices/null c 1 3
+mknod -m 0666 /lib/udev/devices/zero c 1 5
+mknod -m 0600 /lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd /lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 /lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 /lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 /lib/udev/devices/stderr
+ln -snvf /proc/kcore /lib/udev/devices/core
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/common/util-linux.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -93,10 +93,4 @@
make install
-
- Move the logger binary to
- /bin as it is needed by the
- CLFS-Bootscripts package:
-
-mv -v /usr/bin/logger /bin
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/mips-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/mips64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/mips64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -39,4 +39,5 @@
+
@@ -75,5 +76,7 @@
-
+
+
+
@@ -97,4 +100,7 @@
+
+
+
@@ -102,10 +108,18 @@
+
+
+
+
+
+
+
+
+
-
Index: BOOK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/attr-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,70 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Attr-&attr-version; 64 Bit
+
+
+ Attr
+
+
+
+
+
+ Installation of Attr
+
+
+
+CC="gcc ${BUILD64}" ./configure \
+ --prefix=/usr --libdir=/lib64 \
+ --libexecdir=/usr/lib64
+
+
+
+
+
+
+
+
+
+
+
+
+
+rm -v /lib64/libattr.{,l}a
+
+
+
+chmod 755 -v /lib64/libattr.so.1.1.0
+
+
+
+
+
+
Index: BOOK/final-system/multilib/attr-n32.xml
===================================================================
--- BOOK/final-system/multilib/attr-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/attr-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,75 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Attr-&attr-version; N32 Libraries
+
+
+ Attr
+ N32
+
+
+
+
+
+ Installation of Attr
+
+
+
+CC="gcc ${BUILDN32}" ./configure \
+ --prefix=/usr --libdir=/lib32 \
+ --libexecdir=/usr/lib32
+
+
+
+
+
+
+
+
+
+
+
+
+
+rm -v /lib32/libattr.{,l}a
+
+
+
+chmod 755 -v /lib32/libattr.so.1.1.0
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/attr.xml
===================================================================
--- BOOK/final-system/multilib/attr.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/attr.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,79 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Attr-&attr-version; 32 Bit Libraries
+
+
+ Attr
+ 32 Bit
+
+
+
+
+
+ Installation of Attr
+
+
+
+CC="gcc ${BUILD32}" ./configure \
+ --prefix=/usr --libdir=/lib \
+ --libexecdir=/usr/lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/coreutils.xml
===================================================================
--- BOOK/final-system/multilib/coreutils.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/multilib/coreutils.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -106,12 +106,4 @@
xpointer="xpointer(//*[@os='u'])"/>
-
-
-
-
Index: BOOK/final-system/multilib/dbus-64bit.xml
===================================================================
--- BOOK/final-system/multilib/dbus-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/dbus-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,59 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ D-Bus-&dbus-version; 64 Bit
+
+
+ D-Bus
+
+
+
+
+
+ Installation of D-Bus
+
+
+
+CC="gcc ${BUILD64}" USE_ARCH=64 \
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib64 --libexecdir=/usr/lib/dbus-1.0 \
+ --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/multilib/dbus-n32.xml
===================================================================
--- BOOK/final-system/multilib/dbus-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/dbus-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,65 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ D-Bus-&dbus-version; N32 Libraries
+
+
+ D-Bus
+
+
+
+
+
+ Installation of D-Bus
+
+
+
+CC="gcc ${BUILDN32}" USE_ARCH=n32 \
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib32 --libexecdir=/usr/lib/dbus-1.0 \
+ --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
+
+
Index: BOOK/final-system/multilib/dbus.xml
===================================================================
--- BOOK/final-system/multilib/dbus.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/dbus.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,63 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ D-Bus-&dbus-version; 32 Bit Libraries
+
+
+ D-Bus 32 Bit Libraries
+
+
+
+
+
+ Installation of D-Bus
+
+
+
+CC="gcc ${BUILD32}" USE_ARCH=32 \
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
+ --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/expat-64bit.xml
===================================================================
--- BOOK/final-system/multilib/expat-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/expat-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,65 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Expat-&expat-version; 64 Bit
+
+
+ Expat
+
+
+
+
+
+ Installation of Expat
+
+
+
+CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+ --libdir=/usr/lib64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/multilib/expat-n32.xml
===================================================================
--- BOOK/final-system/multilib/expat-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/expat-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,62 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Expat-&expat-version; N32 Libraries
+
+
+ Expat
+ N32
+
+
+
+
+
+ Installation of Expat
+
+
+
+CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+ --libdir=/usr/lib32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/expat.xml
===================================================================
--- BOOK/final-system/multilib/expat.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/expat.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,62 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Expat-&expat-version; 32 Bit Libraries
+
+
+ Expat
+ 32 Bit
+
+
+
+
+
+ Installation of Expat
+
+
+
+CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+ --libdir=/usr/lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/libcap-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libcap-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/libcap-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,50 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Libcap-&libcap-version; 64 Bit
+
+
+ Libcap
+
+
+
+
+
+ Installation of Libcap
+
+
+
+make CC="gcc ${BUILD64}"
+
+
+
+
+
+make lib=lib64 install
+chmod -v 755 /lib64/libcap.so.&libcap-version;
+rm /lib64/libcap.so
+ln -sfv ../../lib64/libcap.so.2 /usr/lib64/libcap.so
+mv -v /lib64/libcap.a /usr/lib64
+
+
+
+
+
+
Index: BOOK/final-system/multilib/libcap-n32.xml
===================================================================
--- BOOK/final-system/multilib/libcap-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/libcap-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,55 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Libcap-&libcap-version; N32 Libraries
+
+
+ Libcap
+ N32
+
+
+
+
+
+ Installation of Libcap
+
+
+
+make CC="gcc ${BUILDN32}"
+
+
+
+
+
+make lib=lib32 install
+chmod -v 755 /lib32/libcap.so.&libcap-version;
+rm /lib32/libcap.so
+ln -sfv ../../lib32/libcap.so.2 /usr/lib32/libcap.so
+mv -v /lib32/libcap.a /usr/lib32
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/libcap.xml
===================================================================
--- BOOK/final-system/multilib/libcap.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/libcap.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,53 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ Libcap-&libcap-version; 32 Bit Libraries
+
+
+ Libcap
+ 32 Bit
+
+
+
+
+
+ Installation of Libcap
+
+
+
+make CC="gcc ${BUILD32}"
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/systemd-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,69 @@
+
+
+ %general-entities;
+]>
+
+
+
+ systemd-&systemd-version;
+
+
+ systemd
+
+
+
+
+
+ Installation of systemd
+
+
+
+
+
+
+
+CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc --localstatedir=/var \
+ --with-rootdir= --with-distro=other \
+ --with-syslog-service=rsyslog.service \
+ --with-sysvinit-path=/etc/init.d \
+ --with-sysvrcd-path=/etc/rc.d
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: BOOK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/systemd-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,66 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ systemd-&systemd-version; N32 Libraries
+
+
+ systemd
+
+
+
+
+
+ Installation of systemd
+
+
+
+
+
+CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc --localstatedir=/var \
+ --with-rootdir= --with-distro=other \
+ --with-syslog-service=rsyslog.service \
+ --with-sysvinit-path=/etc/init.d \
+ --with-sysvrcd-path=/etc/rc.d
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
+++ BOOK/final-system/multilib/systemd.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -0,0 +1,67 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ systemd-&systemd-version; 32 Bit Libraries
+
+
+ systemd
+ 32 Bit
+
+
+
+
+
+ Installation of systemd
+
+
+ If you do not have Linux-PAM installed in your system you can safely
+ skip this page. If you do have Linux-PAM installed and you wish to use
+ pam_systemd.so
+ to register and control user sessions within the systemd control group
+ hierarchy, follow the instructions to install the module.
+
+
+
+
+CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc --localstatedir=/var \
+ --with-rootdir= --with-distro=other \
+ --with-syslog-service=rsyslog.service \
+ --with-sysvinit-path=/etc/init.d \
+ --with-sysvrcd-path=/etc/rc.d
+
+
+
+make pam_systemd.la
+
+
+
+make install-pamlibLTLIBRARIES
+
+
+
+
+
+
+ Details on this package are located in
+
+
+
+
Index: BOOK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/multilib/udev-64bit.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -27,6 +27,8 @@
CC="gcc ${BUILD64}" ./configure --prefix=/usr \
- --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
- --libdir=/usr/lib64 --disable-extras --disable-introspection
+ --exec-prefix="" --sysconfdir=/etc \
+ --sbindir=/sbin --libexecdir=/lib/udev \
+ --libdir=/usr/lib64 --with-systemdsystemunitdir=/lib/systemd/system \
+ --disable-extras --disable-introspection
+
+
Index: BOOK/final-system/multilib/udev-n32.xml
===================================================================
--- BOOK/final-system/multilib/udev-n32.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/multilib/udev-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -26,7 +26,9 @@
xpointer="xpointer(//*[@os='a'])"/>
-CC="gcc ${BUILDN32}"./configure --prefix=/usr \
- --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
- --libdir=/usr/lib32 --disable-extras --disable-introspection
+CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+ --exec-prefix="" --sysconfdir=/etc \
+ --sbindir=/sbin --libexecdir=/lib/udev \
+ --libdir=/usr/lib32 --with-systemdsystemunitdir=/lib/systemd/system \
+ --disable-extras --disable-introspection
CC="gcc ${BUILD32}" ./configure --prefix=/usr \
- --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
- --libdir=/usr/lib --disable-extras --disable-introspection
+ --exec-prefix="" --sysconfdir=/etc \
+ --sbindir=/sbin --libexecdir=/lib/udev \
+ --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
+ --disable-extras --disable-introspection
-
-
-
-
Index: BOOK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/multilib/util-linux-n32.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -54,12 +54,4 @@
xpointer="xpointer(//*[@os='h'])"/>
-
-
-
-
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/multilib/util-linux.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -54,12 +54,4 @@
xpointer="xpointer(//*[@os='h'])"/>
-
-
-
-
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/ppc-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/ppc64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -60,4 +60,6 @@
+
+
@@ -78,14 +80,21 @@
+
+
+
+
+
+
+
+
-
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/sparc-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/sparc64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/sparc64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -60,4 +60,6 @@
+
+
@@ -78,14 +80,21 @@
+
+
+
+
+
+
+
+
-
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/x86-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/x86_64-64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -43,4 +43,5 @@
+
@@ -58,13 +59,16 @@
+
+
+
+
-
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/final-system/x86_64-chapter.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -60,4 +60,6 @@
+
+
@@ -78,14 +80,21 @@
+
+
+
+
+
+
+
+
-
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/general.ent (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -13,4 +13,5 @@
+
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/introduction/common/changelog.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -38,4 +38,14 @@
+ February 13, 2011
+
+
+ [jciccone] - Added systemd and changed the appropriate
+ configuration pages.
+
+
+
+
+
February 10, 2011
@@ -48,6 +58,27 @@
+ February 6, 2011
+
+
+ [jciccone] - Add Expat 2.0.1.
+
+
+ [jciccone] - Add D-Bus 1.4.1.
+
+
+
+
+
January 30, 2011
+
+ [jciccone] - Add systemd 17.
+
+
+ [jciccone] - Add libcap 2.19.
+
+
+ [jciccone] - Add Attr 2.4.44.
+
[jciccone] - Add Pkg-config 0.25.
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/materials/common/packages.xml (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -16,4 +16,13 @@
+ Attr (&attr-version;) - &attr-size;:
+
+ Home page:
+ Download:
+ MD5 sum: &attr-md5;
+
+
+
+
Autoconf (&autoconf-version;) - &autoconf-size;:
@@ -97,4 +106,13 @@
+ D-Bus (&dbus-version;) - &dbus-size;:
+
+ Home page:
+ Download:
+ MD5 sum: &dbus-md5;
+
+
+
+
DejaGNU (&dejagnu-version;) - &dejagnu-size;:
@@ -138,4 +156,13 @@
Download:
MD5 sum: &e2fsprogs-md5;
+
+
+
+
+ Expat (&expat-version;) - &expat-size;:
+
+ Home page:
+ Download:
+ MD5 sum: &expat-md5;
@@ -295,4 +322,13 @@
+ Libcap (&libcap-version;) - &libcap-size;:
+
+ Home page:
+ Download:
+ MD5 sum: &libcap-md5;
+
+
+
+
Libtool (&libtool-version;) - &libtool-size;:
@@ -484,4 +520,13 @@
+ systemd (&systemd-version;) - &systemd-size;:
+
+ Home page:
+ Download:
+ MD5 sum: &systemd-md5;
+
+
+
+
Tar (&tar-version;) - &tar-size;:
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/packages.ent (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -11,4 +11,10 @@
+
+
+
+
+
+
@@ -78,4 +84,10 @@
+
+
+
+
+
+
@@ -130,4 +142,10 @@
+
+
+
+
+
+
@@ -242,4 +260,10 @@
+
+
+
+
+
+
@@ -388,4 +412,10 @@
+
+
+
+
+
+
Index: BOOK/users_groups.ent
===================================================================
--- BOOK/users_groups.ent (revision b47a4a1d93d92208ef3ed33694b28a4eda285fe2)
+++ BOOK/users_groups.ent (revision 1f9faabd3c05c008edf8a831f51f9d8c1b743c6c)
@@ -8,4 +8,5 @@
+
@@ -35,4 +36,5 @@
+