diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-06-27 03:45:16 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-06-27 03:45:16 +0200 |
commit | 4928e9f7d0a17898300f20567a331417fafc16c1 (patch) | |
tree | 4a739752319b99e192485dc8a4dbe08c8083b84f /include | |
parent | 879f008a8f890f83a005d0816d259c6157121e5b (diff) | |
download | busybox-w32-4928e9f7d0a17898300f20567a331417fafc16c1.tar.gz busybox-w32-4928e9f7d0a17898300f20567a331417fafc16c1.tar.bz2 busybox-w32-4928e9f7d0a17898300f20567a331417fafc16c1.zip |
losetup: assorted fixes. Closes 6314
"losetup -d" was not complaining that LOOPDEV is missing.
"losetup -a" was listing only up to /dev/loop9.
"losetup -f" looped forever if llop0 was taken, and never tried
anything after /dev/loop9.
"-o" with other options (say, -r) had no effect.
function old new delta
losetup_main 376 419 +43
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index b5d1156ae..65c6b9f39 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1803,7 +1803,7 @@ extern const char bb_default_login_shell[] ALIGN1; | |||
1803 | # define VC_4 "/dev/vc/4" | 1803 | # define VC_4 "/dev/vc/4" |
1804 | # define VC_5 "/dev/vc/5" | 1804 | # define VC_5 "/dev/vc/5" |
1805 | # define VC_FORMAT "/dev/vc/%d" | 1805 | # define VC_FORMAT "/dev/vc/%d" |
1806 | # define LOOP_FORMAT "/dev/loop/%d" | 1806 | # define LOOP_FORMAT "/dev/loop/%u" |
1807 | # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1) | 1807 | # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1) |
1808 | # define LOOP_NAME "/dev/loop/" | 1808 | # define LOOP_NAME "/dev/loop/" |
1809 | # define FB_0 "/dev/fb/0" | 1809 | # define FB_0 "/dev/fb/0" |
@@ -1816,7 +1816,7 @@ extern const char bb_default_login_shell[] ALIGN1; | |||
1816 | # define VC_4 "/dev/tty4" | 1816 | # define VC_4 "/dev/tty4" |
1817 | # define VC_5 "/dev/tty5" | 1817 | # define VC_5 "/dev/tty5" |
1818 | # define VC_FORMAT "/dev/tty%d" | 1818 | # define VC_FORMAT "/dev/tty%d" |
1819 | # define LOOP_FORMAT "/dev/loop%d" | 1819 | # define LOOP_FORMAT "/dev/loop%u" |
1820 | # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1) | 1820 | # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1) |
1821 | # define LOOP_NAME "/dev/loop" | 1821 | # define LOOP_NAME "/dev/loop" |
1822 | # define FB_0 "/dev/fb0" | 1822 | # define FB_0 "/dev/fb0" |