Fixes
This commit is contained in:
parent
c054b21f7d
commit
1667fb4b63
10
Makefile
10
Makefile
@ -80,6 +80,9 @@ LIBRARIES=
|
|||||||
OBJECTS=$(shell ./busybox.sh)
|
OBJECTS=$(shell ./busybox.sh)
|
||||||
CFLAGS+= -DBB_VER='"$(VERSION)"'
|
CFLAGS+= -DBB_VER='"$(VERSION)"'
|
||||||
CFLAGS+= -DBB_BT='"$(BUILDTIME)"'
|
CFLAGS+= -DBB_BT='"$(BUILDTIME)"'
|
||||||
|
ifdef BB_INIT_RC_EXIT_CMD
|
||||||
|
CFLAGS += -DBB_INIT_CMD_IF_RC_SCRIPT_EXITS=${BB_INIT_RC_EXIT_CMD}
|
||||||
|
endif
|
||||||
|
|
||||||
all: busybox busybox.links
|
all: busybox busybox.links
|
||||||
|
|
||||||
@ -97,19 +100,14 @@ clean:
|
|||||||
distclean: clean
|
distclean: clean
|
||||||
- rm -f $(PROG)
|
- rm -f $(PROG)
|
||||||
|
|
||||||
force:
|
|
||||||
|
|
||||||
$(OBJECTS): busybox.def.h internal.h Makefile
|
$(OBJECTS): busybox.def.h internal.h Makefile
|
||||||
|
|
||||||
install: busybox busybox.links
|
install: busybox busybox.links
|
||||||
./install.sh $(PREFIX)
|
./install.sh $(PREFIX)
|
||||||
|
|
||||||
whichversion:
|
|
||||||
@echo $(VERSION)
|
|
||||||
|
|
||||||
|
|
||||||
dist: release
|
dist: release
|
||||||
|
|
||||||
release: distclean
|
release: distclean
|
||||||
(cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION))
|
(cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION))
|
||||||
|
|
||||||
|
|
||||||
|
9
umount.c
9
umount.c
@ -73,8 +73,13 @@ umount_all(int useMtab)
|
|||||||
while ((m = getmntent (mountTable)) != 0) {
|
while ((m = getmntent (mountTable)) != 0) {
|
||||||
char *blockDevice = m->mnt_fsname;
|
char *blockDevice = m->mnt_fsname;
|
||||||
#if ! defined BB_MTAB
|
#if ! defined BB_MTAB
|
||||||
if (strcmp (blockDevice, "/dev/root") == 0)
|
if (strcmp (blockDevice, "/dev/root") == 0) {
|
||||||
blockDevice = (getfsfile ("/"))->fs_spec;
|
struct fstab* fstabItem;
|
||||||
|
fstabItem = getfsfile ("/");
|
||||||
|
if (fstabItem != NULL) {
|
||||||
|
blockDevice = fstabItem->fs_spec;
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
/* Don't umount /proc when doing umount -a */
|
/* Don't umount /proc when doing umount -a */
|
||||||
if (strcmp (blockDevice, "proc") == 0)
|
if (strcmp (blockDevice, "proc") == 0)
|
||||||
|
@ -73,8 +73,13 @@ umount_all(int useMtab)
|
|||||||
while ((m = getmntent (mountTable)) != 0) {
|
while ((m = getmntent (mountTable)) != 0) {
|
||||||
char *blockDevice = m->mnt_fsname;
|
char *blockDevice = m->mnt_fsname;
|
||||||
#if ! defined BB_MTAB
|
#if ! defined BB_MTAB
|
||||||
if (strcmp (blockDevice, "/dev/root") == 0)
|
if (strcmp (blockDevice, "/dev/root") == 0) {
|
||||||
blockDevice = (getfsfile ("/"))->fs_spec;
|
struct fstab* fstabItem;
|
||||||
|
fstabItem = getfsfile ("/");
|
||||||
|
if (fstabItem != NULL) {
|
||||||
|
blockDevice = fstabItem->fs_spec;
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
/* Don't umount /proc when doing umount -a */
|
/* Don't umount /proc when doing umount -a */
|
||||||
if (strcmp (blockDevice, "proc") == 0)
|
if (strcmp (blockDevice, "proc") == 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user