gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-10 14:24:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to linux-3.0.4 and util-linux-2.20.

Browse Source 
Fix minor bootscript problems.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9587 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2011-08-30 22:54:52 +00:00
parent c0ad0ec4ad
commit 5bc19fc1e5
7 changed files with 119 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
bootscripts/lfs/init.d/cleanfs
View File

@ -30,87 +30,87 @@
# Function to create files/directory on boot. # Function to create files/directory on boot.
create_files() { create_files() {
# Read in the configuration file. # Read in the configuration file.
exec 9>&0 < /etc/sysconfig/createfiles exec 9>&0 < /etc/sysconfig/createfiles
while read name type perm usr grp dtype maj min junk while read name type perm usr grp dtype maj min junk
do do
# Ignore comments and blank lines. # Ignore comments and blank lines.
case "${name}" in case "${name}" in
""|\#*) continue ;; ""|\#*) continue ;;
esac esac
# Ignore existing files. # Ignore existing files.
if [ ! -e "${name}" ]; then if [ ! -e "${name}" ]; then
# Create stuff based on its type. # Create stuff based on its type.
case "${type}" in case "${type}" in
dir) dir)
mkdir "${name}" mkdir "${name}"
;; ;;
file) file)
:> "${name}" :> "${name}"
;; ;;
dev) dev)
case "${dtype}" in case "${dtype}" in
char) char)
mknod "${name}" c ${maj} ${min} mknod "${name}" c ${maj} ${min}
;; ;;
block) block)
mknod "${name}" b ${maj} ${min} mknod "${name}" b ${maj} ${min}
;; ;;
pipe) pipe)
mknod "${name}" p mknod "${name}" p
;; ;;
*) *)
boot_mesg -n "\nUnknown device type: ${dtype}" ${WARNING} boot_mesg -n "\nUnknown device type: ${dtype}" ${WARNING}
boot_mesg "" ${NORMAL} boot_mesg "" ${NORMAL}
;; ;;
esac esac
;; ;;
*) *)
boot_mesg -n "\nUnknown type: ${type}" ${WARNING} boot_mesg -n "\nUnknown type: ${type}" ${WARNING}
boot_mesg "" ${NORMAL} boot_mesg "" ${NORMAL}
continue continue
;; ;;
esac esac
# Set up the permissions, too. # Set up the permissions, too.
chown ${usr}:${grp} "${name}" chown ${usr}:${grp} "${name}"
chmod ${perm} "${name}" chmod ${perm} "${name}"
fi fi
done done
exec 0>&9 9>&- exec 0>&9 9>&-
} }
case "${1}" in case "${1}" in
start) start)
boot_mesg -n "Cleaning file systems:" ${INFO} boot_mesg -n "Cleaning file systems:" ${INFO}
if [ "${SKIPTMPCLEAN}" = "" ]; then if [ "${SKIPTMPCLEAN}" = "" ]; then
boot_mesg -n " /tmp" ${NORMAL} boot_mesg -n " /tmp" ${NORMAL}
cd /tmp && cd /tmp &&
find . -xdev -mindepth 1 ! -name lost+found -delete || failed=1 find . -xdev -mindepth 1 ! -name lost+found -delete || failed=1
fi fi
> /var/run/utmp > /var/run/utmp
if grep -q '^utmp:' /etc/group ; then if grep -q '^utmp:' /etc/group ; then
chmod 664 /var/run/utmp chmod 664 /var/run/utmp
chgrp utmp /var/run/utmp chgrp utmp /var/run/utmp
fi fi
(exit ${failed}) (exit ${failed})
evaluate_retval evaluate_retval
if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
boot_mesg "Creating files and directories..." boot_mesg "Creating files and directories..."
create_files create_files
evaluate_retval evaluate_retval
fi fi
;; ;;
*) *)
echo "Usage: ${0} {start}" echo "Usage: ${0} {start}"
exit 1 exit 1
;; ;;
esac esac
# End cleanfs # End cleanfs

2
bootscripts/lfs/init.d/mountfs
View File

@ -57,7 +57,7 @@ case "${1}" in
stop) stop)
boot_mesg "Unmounting all other currently mounted file systems..." boot_mesg "Unmounting all other currently mounted file systems..."
umount -a -d -r >/dev/null umount -a -d -r -t notmpfs >/dev/null
evaluate_retval evaluate_retval
;; ;;

28
bootscripts/lfs/sysconfig/createfiles
View File

@ -8,21 +8,21 @@
# Version : 00.00 # Version : 00.00
# #
# Notes : The syntax of this file is as follows: # Notes : The syntax of this file is as follows:
# if type is equal to "file" or "dir" # if type is equal to "file" or "dir"
# <filename> <type> <permissions> <user> <group> # <filename> <type> <permissions> <user> <group>
# if type is equal to "dev" # if type is equal to "dev"
# <filename> <type> <permissions> <user> <group> <devtype> <major> <minor> # <filename> <type> <permissions> <user> <group> <devtype> <major> <minor>
# #
# <filename> is the name of the file which is to be created # <filename> is the name of the file which is to be created
# <type> is either file, dir, or dev. # <type> is either file, dir, or dev.
# file creates a new file # file creates a new file
# dir creates a new directory # dir creates a new directory
# dev creates a new device # dev creates a new device
# <devtype> is either block, char or pipe # <devtype> is either block, char or pipe
# block creates a block device # block creates a block device
# char creates a character deivce # char creates a character deivce
# pipe creates a pipe, this will ignore the <major> and <minor> fields # pipe creates a pipe, this will ignore the <major> and <minor> fields
# <major> and <minor> are the major and minor numbers used for the device. # <major> and <minor> are the major and minor numbers used for the device.
######################################################################## ########################################################################
# End /etc/sysconfig/createfiles # End /etc/sysconfig/createfiles

19
chapter01/changelog.xml
View File

@ -36,6 +36,25 @@
</listitem> </listitem>
--> -->
<listitem>
<para>2011-08-29</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to linux-3.0.4. Fixes
<ulink url="&lfs-ticket-root;2914">#2914</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to util-linux-2.20. Fixes
<ulink url="&lfs-ticket-root;2915">#2915</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Fix shutdown problem in bootscripts.
Replace tab characters with spaces.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2011-08-14</para> <para>2011-08-14</para>
<itemizedlist> <itemizedlist>

4
chapter01/whatsnew.xml
View File

@ -205,9 +205,9 @@
<!--<listitem> <!--<listitem>
<para>&udev-config;</para> <para>&udev-config;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Util-Linux &util-linux-version;</para> <para>Util-Linux &util-linux-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Vim &vim-version;</para> <para>Vim &vim-version;</para>
</listitem>--> </listitem>-->

4
general.ent
View File

@ -1,5 +1,5 @@
<!ENTITY version "SVN-20110814"> <!ENTITY version "SVN-20110830">
<!ENTITY releasedate "Aug 14, 2011"> <!ENTITY releasedate "Aug 30, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.0"> <!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

24
packages.ent
View File

@ -297,7 +297,7 @@
<!ENTITY less-ch6-du "3.5 MB"> <!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU"> <!ENTITY less-ch6-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20110803"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-version "20110830"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->
@ -323,19 +323,19 @@
<!ENTITY linux-major-version "3"> <!ENTITY linux-major-version "3">
<!ENTITY linux-minor-version "0"> <!ENTITY linux-minor-version "0">
<!ENTITY linux-patch-version "1"> <!ENTITY linux-patch-version "4">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-size "74,955 KB"> <!ENTITY linux-size "74,961 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.bz2"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.bz2">
<!ENTITY linux-md5 "aed949984b878b7fb77ffe9cbee8ce0c"> <!ENTITY linux-md5 "dff86c657cabe813bda84c72bfb93ae8">
<!ENTITY linux-home "http://www.kernel.org/"> <!ENTITY linux-home "http://www.kernel.org/">
<!ENTITY linux-ch8-du "540 - 800 MB"> <!ENTITY linux-ch8-du "540 - 800 MB">
<!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU"> <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
<!ENTITY linux-headers-ch5-du "510 MB"> <!ENTITY linux-headers-ch5-du "511 MB">
<!ENTITY linux-headers-ch5-sbu "0.1 SBU"> <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
<!ENTITY linux-headers-ch6-du "514 MB"> <!ENTITY linux-headers-ch6-du "515 MB">
<!ENTITY linux-headers-ch6-sbu "0.1 SBU"> <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
<!ENTITY m4-version "1.4.16"> <!ENTITY m4-version "1.4.16">
@ -557,15 +557,15 @@
<!ENTITY udev-config-md5 "UDEV-MD5SUM"> <!-- Updated in Makefile --> <!ENTITY udev-config-md5 "UDEV-MD5SUM"> <!-- Updated in Makefile -->
<!ENTITY udev-config-home " "> <!ENTITY udev-config-home " ">
<!ENTITY util-linux-version "2.19.1"> <!ENTITY util-linux-version "2.20">
<!ENTITY util-linux-size "4,294 KB"> <!ENTITY util-linux-size "4,507 KB">
<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.19/util-linux-&util-linux-version;.tar.bz2"> <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.20/util-linux-&util-linux-version;.tar.bz2">
<!ENTITY util-linux-md5 "3eab06f05163dfa65479c44e5231932c"> <!ENTITY util-linux-md5 "4dcacdbdafa116635e52b977d9d0e879">
<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/"> <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
<!--<!ENTITY util-linux-ch5-du "19 MB">--> <!--<!ENTITY util-linux-ch5-du "19 MB">-->
<!--<!ENTITY util-linux-ch5-sbu "0.1 SBU">--> <!--<!ENTITY util-linux-ch5-sbu "0.1 SBU">-->
<!ENTITY util-linux-ch6-du "50 MB"> <!ENTITY util-linux-ch6-du "69 MB">
<!ENTITY util-linux-ch6-sbu "0.6 SBU"> <!ENTITY util-linux-ch6-sbu "0.7 SBU">
<!ENTITY vim-version "7.3"> <!ENTITY vim-version "7.3">
<!ENTITY vim-docdir "vim/vim73"> <!ENTITY vim-docdir "vim/vim73">