Imported from util-linux-2.12r-pre1 tarball.
This commit is contained in:
parent
091b402e31
commit
9d761c85e0
6
HISTORY
6
HISTORY
|
@ -1,4 +1,10 @@
|
||||||
|
util-linux 2.12r-pre1
|
||||||
|
|
||||||
|
* cfdisk: fix a segfault with ReiserFS partitions
|
||||||
|
* umount: disallow -r option for non-root users
|
||||||
|
|
||||||
util-linux 2.12q
|
util-linux 2.12q
|
||||||
|
|
||||||
* updated translation: nl
|
* updated translation: nl
|
||||||
|
|
||||||
util-linux 2.12q-pre2
|
util-linux 2.12q-pre2
|
||||||
|
|
|
@ -717,7 +717,7 @@ get_linux_label(int i) {
|
||||||
offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
|
offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
|
||||||
+ REISERFS_DISK_OFFSET_IN_BYTES;
|
+ REISERFS_DISK_OFFSET_IN_BYTES;
|
||||||
if (ext2_llseek(fd, offset, SEEK_SET) == offset
|
if (ext2_llseek(fd, offset, SEEK_SET) == offset
|
||||||
&& read(fd, &reiserfsb, 1024) == 1024
|
&& read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb)
|
||||||
&& has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
|
&& has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
|
||||||
if (reiserfs_is_3_6) {
|
if (reiserfs_is_3_6) {
|
||||||
/* label only on version 3.6 onward */
|
/* label only on version 3.6 onward */
|
||||||
|
|
|
@ -714,7 +714,7 @@ main (int argc, char *argv[]) {
|
||||||
|
|
||||||
if (getuid () != geteuid ()) {
|
if (getuid () != geteuid ()) {
|
||||||
suid = 1;
|
suid = 1;
|
||||||
if (all || types || nomtab || force)
|
if (all || types || nomtab || force || remount)
|
||||||
die (2, _("umount: only root can do that"));
|
die (2, _("umount: only root can do that"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue