Merge branch '2.4' into 2.5
Conflicts: iproute2/.md5sum iproute2/Pkgfile Merge changes to util-linux-ng from 2.4 branch, but keep the 2.5 version of iproute2 util-linux-ng: merge upstream fix to address FS#358
This commit is contained in:
commit
14f6c1f393
@ -1 +1,2 @@
|
|||||||
|
253bf36e58b966128ca225fc691c8091 util-linux-ng-2.14.1-mtab.patch
|
||||||
17bafd53cf242accd716d2306a2c6582 util-linux-ng-2.14.1.tar.gz
|
17bafd53cf242accd716d2306a2c6582 util-linux-ng-2.14.1.tar.gz
|
||||||
|
@ -5,11 +5,13 @@
|
|||||||
|
|
||||||
name=util-linux-ng
|
name=util-linux-ng
|
||||||
version=2.14.1
|
version=2.14.1
|
||||||
release=1
|
release=2
|
||||||
source=(http://www.kernel.org/pub/linux/utils/$name/v2.14/$name-$version.tar.gz)
|
source=(http://www.kernel.org/pub/linux/utils/$name/v2.14/$name-$version.tar.gz
|
||||||
|
$name-$version-mtab.patch)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
|
patch -p1 -i $SRC/$name-$version-mtab.patch
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--mandir=/usr/man \
|
--mandir=/usr/man \
|
||||||
--disable-{nls,elvtune,wall} \
|
--disable-{nls,elvtune,wall} \
|
||||||
|
17
util-linux-ng/util-linux-ng-2.14.1-mtab.patch
Normal file
17
util-linux-ng/util-linux-ng-2.14.1-mtab.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
--- util-linux-ng-2.14.1.orig/mount/fstab.c 2008-10-01 10:00:15.000000000 +0200
|
||||||
|
+++ util-linux-ng-2.14.1/mount/fstab.c 2008-10-01 10:03:09.000000000 +0200
|
||||||
|
@@ -30,9 +30,12 @@
|
||||||
|
|
||||||
|
static void
|
||||||
|
get_mtab_info(void) {
|
||||||
|
- struct stat mtab_stat;
|
||||||
|
-
|
||||||
|
if (!have_mtab_info) {
|
||||||
|
+ struct stat mtab_stat;
|
||||||
|
+
|
||||||
|
+ var_mtab_does_not_exist = 0;
|
||||||
|
+ var_mtab_is_a_symlink = 0;
|
||||||
|
+
|
||||||
|
if (lstat(_PATH_MOUNTED, &mtab_stat))
|
||||||
|
var_mtab_does_not_exist = 1;
|
||||||
|
else if (S_ISLNK(mtab_stat.st_mode))
|
Loading…
Reference in New Issue
Block a user