diff options
| author | jkh <jkh@FreeBSD.org> | 1997-10-29 07:47:06 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-10-29 07:47:06 +0000 |
| commit | b330f47cb6069bc0caa7755c014ad20eb569028f (patch) | |
| tree | 1313e4a3cb52392a821ccd183b7b9eff95061ff8 | |
| parent | 97cd2cfa61365cc76deb31f3cf0649fe87138596 (diff) | |
| download | FreeBSD-src-b330f47cb6069bc0caa7755c014ad20eb569028f.zip FreeBSD-src-b330f47cb6069bc0caa7755c014ad20eb569028f.tar.gz | |
Do chflags properly even when running multi-user.
| -rw-r--r-- | release/sysinstall/installUpgrade.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/installUpgrade.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index fc1d89c..ab4337a 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: installUpgrade.c,v 1.52 1997/10/01 01:30:35 jkh Exp $ + * $Id: installUpgrade.c,v 1.53 1997/10/12 16:21:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -232,10 +232,6 @@ installUpgrade(dialogMenuItem *self) return DITEM_FAILURE | DITEM_RESTORE; } - if (extractingBin) { - msgNotify("chflags'ing old binaries - please wait."); - (void)vsystem("chflags -R noschg /mnt/"); - } msgNotify("Updating /stand on root filesystem"); (void)vsystem("find -x /stand | cpio %s -pdum /mnt", cpioVerbosity()); @@ -272,6 +268,10 @@ installUpgrade(dialogMenuItem *self) "Do you want to continue anyway?", saved_etc) != 0) return DITEM_FAILURE | DITEM_RESTORE; } + + msgNotify("chflags'ing old binaries - please wait."); + (void)vsystem("chflags -R noschg /bin /sbin /usr/sbin /usr/bin /kernel*"); + if (file_readable("/kernel")) { msgNotify("Moving old kernel to /kernel.prev"); if (system("chflags noschg /kernel && mv /kernel /kernel.prev")) { diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c index fc1d89c..ab4337a 100644 --- a/usr.sbin/sysinstall/installUpgrade.c +++ b/usr.sbin/sysinstall/installUpgrade.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: installUpgrade.c,v 1.52 1997/10/01 01:30:35 jkh Exp $ + * $Id: installUpgrade.c,v 1.53 1997/10/12 16:21:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -232,10 +232,6 @@ installUpgrade(dialogMenuItem *self) return DITEM_FAILURE | DITEM_RESTORE; } - if (extractingBin) { - msgNotify("chflags'ing old binaries - please wait."); - (void)vsystem("chflags -R noschg /mnt/"); - } msgNotify("Updating /stand on root filesystem"); (void)vsystem("find -x /stand | cpio %s -pdum /mnt", cpioVerbosity()); @@ -272,6 +268,10 @@ installUpgrade(dialogMenuItem *self) "Do you want to continue anyway?", saved_etc) != 0) return DITEM_FAILURE | DITEM_RESTORE; } + + msgNotify("chflags'ing old binaries - please wait."); + (void)vsystem("chflags -R noschg /bin /sbin /usr/sbin /usr/bin /kernel*"); + if (file_readable("/kernel")) { msgNotify("Moving old kernel to /kernel.prev"); if (system("chflags noschg /kernel && mv /kernel /kernel.prev")) { |
