mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-27 17:52:43 +00:00
A couple of cosmetic tweaks to tape install method and fstab file format.
Submitted-By: Flemming Jacobsen <fj@schizo.dk.tfs.com>
This commit is contained in:
parent
2e59a10476
commit
6dfa1330e5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=21902
@ -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())
|
||||
|
@ -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
|
||||
|
@ -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())
|
||||
|
@ -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())
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user