search for: nuke_dir

Hi In run-init.c there is a minor bug which can cause major problems i.e. not able to boot systems with udev-enabled initramfs on systems with multiple cdrom drives. In nuke_dirent () in run-init.c the stat call should be replaced with a lstat call, else nuking symbolic links which have been created before the link target will fail. Was somewhat tricky to debug... The bug gets triggered by udev with the /dev/cdrom symbolic link rule (from the default udev rules file) if th...

On a train ride to Bruxelles, brought out my axe and directly attacked run_init(8). run_init(8) is dead, long live switch_root(8). The next run on switch_root(8) involves fdopendir, so another push for the upcoming stdio 1.6 branch. The following is boot tested with initramfs-tools, kinit(8) tests would very much be appreciated!? Michal Suchanek (1): [klibc] switch_root: Fix single file

...ps, bool dry_run, const char *init, char **initargs) { - struct stat rst, cst; + struct stat rst, cst, ist; struct statfs sfs; int confd; @@ -186,13 +186,15 @@ const char *run_init(const char *realroo /* Okay, I think we should be safe... */ - /* Delete rootfs contents */ - if (nuke_dir("/")) - return "nuking initramfs contents"; - - /* Overmount the root */ - if (mount(".", "/", NULL, MS_MOVE, NULL)) - return "overmounting root"; + if (!dry_run) { + /* Delete rootfs contents */ + if (nuke_dir("/")) + return "n...

...sist_initramfs, const char *init, char **initargs) + { + struct stat rst, cst, ist; + struct statfs sfs; +@@ -187,9 +187,11 @@ const char *run_init(const char *realroot, const char *console, + /* Okay, I think we should be safe... */ + + if (!dry_run) { +- /* Delete rootfs contents */ +- if (nuke_dir("/")) +- return "nuking initramfs contents"; ++ if (!persist_initramfs) { ++ /* Delete rootfs contents */ ++ if (nuke_dir("/")) ++ return "nuking initramfs contents"; ++ } + + /* Overmount the root */ + if (mount(".", "/",...

...bool persist_initramfs, const char *init, char **initargs) { struct stat rst, cst, ist; struct statfs sfs; @@ -187,9 +187,11 @@ const char *run_init(const char *realroot, const char *console, /* Okay, I think we should be safe... */ if (!dry_run) { - /* Delete rootfs contents */ - if (nuke_dir("/")) - return "nuking initramfs contents"; + if (!persist_initramfs) { + /* Delete rootfs contents */ + if (nuke_dir("/")) + return "nuking initramfs contents"; + } /* Overmount the root */ if (mount(".", "/", NULL, MS_...

...bool persist_initramfs, const char *init, char **initargs) { struct stat rst, cst, ist; struct statfs sfs; @@ -187,9 +187,11 @@ const char *run_init(const char *realroot, const char *console, /* Okay, I think we should be safe... */ if (!dry_run) { - /* Delete rootfs contents */ - if (nuke_dir("/")) - return "nuking initramfs contents"; + if (!persist_initramfs) { + /* Delete rootfs contents */ + if (nuke_dir("/")) + return "nuking initramfs contents"; + } /* Overmount the root */ if (mount(".", "/", NULL, MS_...

...char *init, char **initargs) { - struct stat rst, cst; + struct stat rst, cst, ist; struct statfs sfs; int confd; @@ -186,13 +186,15 @@ const char *run_init(const char *realroot, const char *console, /* Okay, I think we should be safe... */ - /* Delete rootfs contents */ - if (nuke_dir("/")) - return "nuking initramfs contents"; + if (!dry_run) { + /* Delete rootfs contents */ + if (nuke_dir("/")) + return "nuking initramfs contents"; - /* Overmount the root */ - if (mount(".", "/", NULL, MS_MOVE, NULL)) - return...

...20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/usr/utils/nuke.c b/usr/utils/nuke.c index 01b300f..9470bcf 100644 --- a/usr/utils/nuke.c +++ b/usr/utils/nuke.c @@ -101,18 +101,11 @@ static int nuke(const char *what) /* It's a directory. */ err = nuke_dir(what); if (!err) - err = rmdir(what) ? errno : err; - } else { - err = errno; + rmdir(what); } } - if (err) { - fprintf(stderr, "%s: %s: %s\n", program, what, strerror(err)); - return err; - } else { - return 0; - } + return 0; } int main(int argc, char *argv[])...

The following patches come from Debian and/or Ubuntu packages of klibc. Ben. Ben Hutchings (1): [klibc] run-init: Add dry-run mode Jay Vosburgh (1): [klibc] ipconfig: Use separate sockets for DHCP from multiple interfaces Mathieu Trudel-Lapierre (1): [klibc] ipconfig: Set broadcast when sending DHCPREQUEST and DHCPDISCOVER YunQiang Su (1): [klibc] mips: setjmp.S: don't