diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1997-01-20 19:36:31 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1997-01-20 19:36:31 +0000 |
commit | 6dfa1330e59be88bbac5397b7772f885f521ee4b (patch) | |
tree | 138073ddbf64d083f49c4896bd706703bd4588af | |
parent | 2e59a1047674a563268cbbb6c66a48559206a4f2 (diff) | |
download | src-6dfa1330e59be88bbac5397b7772f885f521ee4b.tar.gz src-6dfa1330e59be88bbac5397b7772f885f521ee4b.zip |
A couple of cosmetic tweaks to tape install method and fstab file format.
Submitted-By: Flemming Jacobsen <fj@schizo.dk.tfs.com>
Notes
Notes:
svn path=/head/; revision=21902
-rw-r--r-- | release/sysinstall/config.c | 10 | ||||
-rw-r--r-- | release/sysinstall/tape.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/config.c | 10 | ||||
-rw-r--r-- | usr.sbin/sysinstall/config.c | 10 | ||||
-rw-r--r-- | usr.sbin/sysinstall/tape.c | 2 |
5 files changed, 20 insertions, 14 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index e9e411fcf5e7..3554285a85d1 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -231,11 +231,13 @@ configFstab(void) /* Go for the burn */ msgDebug("Generating /etc/fstab file\n"); + fprintf(fstab, "# Device\t\tMountpoint\tFStype\tOptions\t\tDump?\tfsck pass#\n"); + fprintf(fstab, "#\t\t\t\t\t\t\t\t\t(0=no) (0=no fsck)\n"); for (i = 0; i < nchunks; i++) - fprintf(fstab, "/dev/%s\t\t\t%s\t\t%s\t%s %d %d\n", name_of(chunk_list[i]), mount_point(chunk_list[i]), + fprintf(fstab, "/dev/%s\t\t%s\t%s\t%s\t\t%d\t%d\n", name_of(chunk_list[i]), mount_point(chunk_list[i]), fstype(chunk_list[i]), fstype_short(chunk_list[i]), seq_num(chunk_list[i]), seq_num(chunk_list[i])); Mkdir("/proc"); - fprintf(fstab, "proc\t\t\t\t/proc\t\tprocfs\trw 0 0\n"); + fprintf(fstab, "proc\t\t/proc\tprocfs\t\trw\t0\t0\n"); /* Now look for the CDROMs */ devs = deviceFind(NULL, DEVICE_TYPE_CDROM); @@ -247,7 +249,7 @@ configFstab(void) msgConfirm("Unable to make mount point for: /cdrom"); } else - fprintf(fstab, "/dev/%s\t\t\t/cdrom\t\tcd9660\tro,noauto 0 0\n", devs[0]->name); + fprintf(fstab, "/dev/%s\t\t/cdrom\tcd9660\t\tro,noauto\t0\t0\n", devs[0]->name); } /* Write the others out as /cdrom<n> */ @@ -259,7 +261,7 @@ configFstab(void) msgConfirm("Unable to make mount point for: %s", cdname); } else - fprintf(fstab, "/dev/%s\t\t\t%s\t\tcd9660\tro,noauto 0 0\n", devs[i]->name, cdname); + fprintf(fstab, "/dev/%s\t\t%s\tcd9660\t\tro,noauto\t0\t0\n", devs[i]->name, cdname); } fclose(fstab); if (isDebug()) diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c index 31c99dd3c80d..94bb6eace1ed 100644 --- a/release/sysinstall/tape.c +++ b/release/sysinstall/tape.c @@ -65,7 +65,7 @@ mediaInitTape(Device *dev) return FALSE; } /* We know the tape is already in the drive, so go for it */ - msgNotify("Attempting to extract from %s...", dev->description); + msgNotify("Extracting distributions from %s...", dev->description); if (!strcmp(dev->name, "rft0")) i = vsystem("ft | cpio -idum %s --block-size %s", cpioVerbosity(), mediaTapeBlocksize()); else diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index e9e411fcf5e7..3554285a85d1 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -231,11 +231,13 @@ configFstab(void) /* Go for the burn */ msgDebug("Generating /etc/fstab file\n"); + fprintf(fstab, "# Device\t\tMountpoint\tFStype\tOptions\t\tDump?\tfsck pass#\n"); + fprintf(fstab, "#\t\t\t\t\t\t\t\t\t(0=no) (0=no fsck)\n"); for (i = 0; i < nchunks; i++) - fprintf(fstab, "/dev/%s\t\t\t%s\t\t%s\t%s %d %d\n", name_of(chunk_list[i]), mount_point(chunk_list[i]), + fprintf(fstab, "/dev/%s\t\t%s\t%s\t%s\t\t%d\t%d\n", name_of(chunk_list[i]), mount_point(chunk_list[i]), fstype(chunk_list[i]), fstype_short(chunk_list[i]), seq_num(chunk_list[i]), seq_num(chunk_list[i])); Mkdir("/proc"); - fprintf(fstab, "proc\t\t\t\t/proc\t\tprocfs\trw 0 0\n"); + fprintf(fstab, "proc\t\t/proc\tprocfs\t\trw\t0\t0\n"); /* Now look for the CDROMs */ devs = deviceFind(NULL, DEVICE_TYPE_CDROM); @@ -247,7 +249,7 @@ configFstab(void) msgConfirm("Unable to make mount point for: /cdrom"); } else - fprintf(fstab, "/dev/%s\t\t\t/cdrom\t\tcd9660\tro,noauto 0 0\n", devs[0]->name); + fprintf(fstab, "/dev/%s\t\t/cdrom\tcd9660\t\tro,noauto\t0\t0\n", devs[0]->name); } /* Write the others out as /cdrom<n> */ @@ -259,7 +261,7 @@ configFstab(void) msgConfirm("Unable to make mount point for: %s", cdname); } else - fprintf(fstab, "/dev/%s\t\t\t%s\t\tcd9660\tro,noauto 0 0\n", devs[i]->name, cdname); + fprintf(fstab, "/dev/%s\t\t%s\tcd9660\t\tro,noauto\t0\t0\n", devs[i]->name, cdname); } fclose(fstab); if (isDebug()) diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index e9e411fcf5e7..3554285a85d1 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -231,11 +231,13 @@ configFstab(void) /* Go for the burn */ msgDebug("Generating /etc/fstab file\n"); + fprintf(fstab, "# Device\t\tMountpoint\tFStype\tOptions\t\tDump?\tfsck pass#\n"); + fprintf(fstab, "#\t\t\t\t\t\t\t\t\t(0=no) (0=no fsck)\n"); for (i = 0; i < nchunks; i++) - fprintf(fstab, "/dev/%s\t\t\t%s\t\t%s\t%s %d %d\n", name_of(chunk_list[i]), mount_point(chunk_list[i]), + fprintf(fstab, "/dev/%s\t\t%s\t%s\t%s\t\t%d\t%d\n", name_of(chunk_list[i]), mount_point(chunk_list[i]), fstype(chunk_list[i]), fstype_short(chunk_list[i]), seq_num(chunk_list[i]), seq_num(chunk_list[i])); Mkdir("/proc"); - fprintf(fstab, "proc\t\t\t\t/proc\t\tprocfs\trw 0 0\n"); + fprintf(fstab, "proc\t\t/proc\tprocfs\t\trw\t0\t0\n"); /* Now look for the CDROMs */ devs = deviceFind(NULL, DEVICE_TYPE_CDROM); @@ -247,7 +249,7 @@ configFstab(void) msgConfirm("Unable to make mount point for: /cdrom"); } else - fprintf(fstab, "/dev/%s\t\t\t/cdrom\t\tcd9660\tro,noauto 0 0\n", devs[0]->name); + fprintf(fstab, "/dev/%s\t\t/cdrom\tcd9660\t\tro,noauto\t0\t0\n", devs[0]->name); } /* Write the others out as /cdrom<n> */ @@ -259,7 +261,7 @@ configFstab(void) msgConfirm("Unable to make mount point for: %s", cdname); } else - fprintf(fstab, "/dev/%s\t\t\t%s\t\tcd9660\tro,noauto 0 0\n", devs[i]->name, cdname); + fprintf(fstab, "/dev/%s\t\t%s\tcd9660\t\tro,noauto\t0\t0\n", devs[i]->name, cdname); } fclose(fstab); if (isDebug()) diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c index 31c99dd3c80d..94bb6eace1ed 100644 --- a/usr.sbin/sysinstall/tape.c +++ b/usr.sbin/sysinstall/tape.c @@ -65,7 +65,7 @@ mediaInitTape(Device *dev) return FALSE; } /* We know the tape is already in the drive, so go for it */ - msgNotify("Attempting to extract from %s...", dev->description); + msgNotify("Extracting distributions from %s...", dev->description); if (!strcmp(dev->name, "rft0")) i = vsystem("ft | cpio -idum %s --block-size %s", cpioVerbosity(), mediaTapeBlocksize()); else |