From: Stefan Schantl <Stevee@ipfire.org>
Date: Wed, 29 Jul 2009 17:41:42 +0000 (+0200)
Subject: rootfile update: e2fsprogs util-linux-ng
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe428f86a25a1077776e1e1023ff02bfaed3849;p=ipfire-3.x.git

rootfile update: e2fsprogs util-linux-ng
---

diff --git a/src/rootfiles/core/e2fsprogs b/src/rootfiles/core/e2fsprogs
index 7653d1279..8dee6f333 100644
--- a/src/rootfiles/core/e2fsprogs
+++ b/src/rootfiles/core/e2fsprogs
@@ -7,8 +7,6 @@ lib/libext2fs.so.2
 lib/libext2fs.so.2.4
 lib/libss.so.2
 lib/libss.so.2.0
-lib/libuuid.so.1
-lib/libuuid.so.1.2
 sbin/badblocks
 sbin/debugfs
 sbin/dumpe2fs
@@ -32,7 +30,6 @@ usr/bin/chattr
 #usr/bin/compile_et
 usr/bin/lsattr
 #usr/bin/mk_cmds
-usr/bin/uuidgen
 #usr/include/e2p
 #usr/include/e2p/e2p.h
 #usr/include/et
@@ -50,8 +47,6 @@ usr/bin/uuidgen
 #usr/include/ss
 #usr/include/ss/ss.h
 #usr/include/ss/ss_err.h
-#usr/include/uuid
-#usr/include/uuid/uuid.h
 #usr/lib/e2initrd_helper
 #usr/lib/libcom_err.a
 usr/lib/libcom_err.so
@@ -61,16 +56,12 @@ usr/lib/libe2p.so
 usr/lib/libext2fs.so
 #usr/lib/libss.a
 usr/lib/libss.so
-#usr/lib/libuuid.a
-usr/lib/libuuid.so
 #usr/lib/pkgconfig/com_err.pc
 #usr/lib/pkgconfig/e2p.pc
 #usr/lib/pkgconfig/ext2fs.pc
 #usr/lib/pkgconfig/ss.pc
-#usr/lib/pkgconfig/uuid.pc
 #usr/sbin/filefrag
 usr/sbin/mklost+found
-usr/sbin/uuidd
 #usr/share/et
 #usr/share/et/et_c.awk
 #usr/share/et/et_h.awk
@@ -92,19 +83,7 @@ usr/sbin/uuidd
 #usr/share/man/man1/compile_et.1
 #usr/share/man/man1/lsattr.1
 #usr/share/man/man1/mk_cmds.1
-#usr/share/man/man1/uuidgen.1
 #usr/share/man/man3/com_err.3
-#usr/share/man/man3/uuid.3
-#usr/share/man/man3/uuid_clear.3
-#usr/share/man/man3/uuid_compare.3
-#usr/share/man/man3/uuid_copy.3
-#usr/share/man/man3/uuid_generate.3
-#usr/share/man/man3/uuid_generate_random.3
-#usr/share/man/man3/uuid_generate_time.3
-#usr/share/man/man3/uuid_is_null.3
-#usr/share/man/man3/uuid_parse.3
-#usr/share/man/man3/uuid_time.3
-#usr/share/man/man3/uuid_unparse.3
 #usr/share/man/man5/e2fsck.conf.5
 #usr/share/man/man5/mke2fs.conf.5
 #usr/share/man/man8/badblocks.8
@@ -128,7 +107,6 @@ usr/sbin/uuidd
 #usr/share/man/man8/mklost+found.8
 #usr/share/man/man8/resize2fs.8
 #usr/share/man/man8/tune2fs.8
-#usr/share/man/man8/uuidd.8
 #usr/share/ss
 #usr/share/ss/ct_c.awk
 #usr/share/ss/ct_c.sed
diff --git a/src/rootfiles/core/util-linux-ng b/src/rootfiles/core/util-linux-ng
index c16e273e3..b502086e9 100644
--- a/src/rootfiles/core/util-linux-ng
+++ b/src/rootfiles/core/util-linux-ng
@@ -6,8 +6,9 @@ bin/more
 bin/mount
 bin/umount
 etc/pam.d/login
-lib/libblkid.so
+lib/libblkid.so.1
 lib/libblkid.so.1.1.0
+lib/libuuid.so.1
 lib/libuuid.so.1.3.0
 sbin/agetty
 sbin/blkid
@@ -17,6 +18,7 @@ sbin/clock
 sbin/ctrlaltdel
 sbin/fdisk
 sbin/findfs
+sbin/fsck
 #sbin/fsck.cramfs
 sbin/hwclock
 sbin/losetup
@@ -28,7 +30,6 @@ sbin/pivot_root
 sbin/sfdisk
 sbin/swapoff
 sbin/swapon
-sbin/fsck
 sbin/switch_root
 #usr/bin/cal
 usr/bin/chfn
@@ -71,15 +72,18 @@ usr/bin/setterm
 #usr/bin/tailf
 #usr/bin/taskset
 #usr/bin/ul
+usr/bin/uuidgen
 usr/bin/whereis
 usr/bin/write
 #usr/include/blkid
 #usr/include/blkid/blkid.h
+#usr/include/uuid
+#usr/include/uuid/uuid.h
+usr/lib/libblkid.so
+usr/lib/libuuid.so
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/blkid.pc
-#usr/lib/libblkid.la
-usr/lib/libblkid.so
-#usr/lib/libuuid.la
+#usr/lib/pkgconfig/uuid.pc
 usr/sbin/addpart
 usr/sbin/delpart
 #usr/sbin/fdformat
@@ -89,6 +93,7 @@ usr/sbin/partx
 #usr/sbin/readprofile
 #usr/sbin/rtcwake
 #usr/sbin/tunelp
+usr/sbin/uuidd
 #usr/share/getopt
 #usr/share/getopt/getopt-parse.bash
 #usr/share/getopt/getopt-parse.tcsh
@@ -158,9 +163,21 @@ usr/sbin/partx
 #usr/share/man/man1/tailf.1
 #usr/share/man/man1/taskset.1
 #usr/share/man/man1/ul.1
+#usr/share/man/man1/uuidgen.1
 #usr/share/man/man1/whereis.1
 #usr/share/man/man1/write.1
 #usr/share/man/man3/libblkid.3
+#usr/share/man/man3/uuid.3
+#usr/share/man/man3/uuid_clear.3
+#usr/share/man/man3/uuid_compare.3
+#usr/share/man/man3/uuid_copy.3
+#usr/share/man/man3/uuid_generate.3
+#usr/share/man/man3/uuid_generate_random.3
+#usr/share/man/man3/uuid_generate_time.3
+#usr/share/man/man3/uuid_is_null.3
+#usr/share/man/man3/uuid_parse.3
+#usr/share/man/man3/uuid_time.3
+#usr/share/man/man3/uuid_unparse.3
 #usr/share/man/man5/fstab.5
 #usr/share/man/man8/addpart.8
 #usr/share/man/man8/agetty.8
@@ -173,6 +190,7 @@ usr/sbin/partx
 #usr/share/man/man8/fdformat.8
 #usr/share/man/man8/fdisk.8
 #usr/share/man/man8/findfs.8
+#usr/share/man/man8/fsck.8
 #usr/share/man/man8/hwclock.8
 #usr/share/man/man8/i386.8
 #usr/share/man/man8/isosize.8
@@ -190,8 +208,8 @@ usr/sbin/partx
 #usr/share/man/man8/sfdisk.8
 #usr/share/man/man8/swapoff.8
 #usr/share/man/man8/swapon.8
+#usr/share/man/man8/switch_root.8
 #usr/share/man/man8/tunelp.8
 #usr/share/man/man8/umount.8
-#usr/share/man/man8/fsck.8
-#usr/share/man/man8/switch_root.8
+#usr/share/man/man8/uuidd.8
 var/lib/hwclock