Merge pull request #4275 from mglae/le10_installer_fat16

installer: use FAT16 for Generic system partition / dosfstools: reduce fsck.fat log spam
This commit is contained in:
Christian Hewitt 2020-04-04 07:35:56 +04:00 committed by GitHub
commit 383f64050d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 3 deletions

View File

@ -0,0 +1,23 @@
Do not print backup boot sector diff in non interactive mode to avoid log spam.
--- a/src/boot.c 2017-01-23 02:16:58.000000000 +0100
+++ a/src/boot.c 2020-02-05 18:32:16.000000000 +0100
@@ -174,6 +174,9 @@ static void check_backup_boot(DOS_FS * f
char buf[20];
printf("There are differences between boot sector and its backup.\n");
+ if (!interactive)
+ printf("This is mostly harmless.\n");
+ else {
printf("This is mostly harmless. Differences: (offset:original/backup)\n ");
pos = 2;
for (p = (uint8_t *) b, q = (uint8_t *) & b2, i = 0; i < sizeof(b2);
@@ -188,6 +191,7 @@ static void check_backup_boot(DOS_FS * f
first = 0;
}
}
+ }
printf("\n");
if (interactive)

View File

@ -206,10 +206,18 @@ do_install_quick() {
partsize_storage_end=-1024 partsize_storage_end=-1024
msg_progress_install "10" "Creating partition on $INSTALL_DEVICE" msg_progress_install "10" "Creating partition on $INSTALL_DEVICE"
parted -s $INSTALL_DEVICE unit s mkpart primary fat32 -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1 if [ "$GPT" = "1" ]; then
parted -s $INSTALL_DEVICE unit s mkpart $DISKLABEL_SYSTEM fat16 -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1
else
parted -s $INSTALL_DEVICE unit s mkpart primary fat16 -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1
fi
msg_progress_install "13" "Creating partition on $INSTALL_DEVICE" msg_progress_install "13" "Creating partition on $INSTALL_DEVICE"
parted -s $INSTALL_DEVICE unit s mkpart primary ext4 -- $partsize_storage_start $partsize_storage_end >> $LOGFILE 2>&1 if [ "$GPT" = "1" ]; then
parted -s $INSTALL_DEVICE unit s mkpart $DISKLABEL_STORAGE ext4 -- $partsize_storage_start $partsize_storage_end >> $LOGFILE 2>&1
else
parted -s $INSTALL_DEVICE unit s mkpart primary ext4 -- $partsize_storage_start $partsize_storage_end >> $LOGFILE 2>&1
fi
msg_progress_install "16" "Setup bootflag on partition 1 of $INSTALL_DEVICE" msg_progress_install "16" "Setup bootflag on partition 1 of $INSTALL_DEVICE"
parted -s $INSTALL_DEVICE set 1 boot on >> $LOGFILE 2>&1 parted -s $INSTALL_DEVICE set 1 boot on >> $LOGFILE 2>&1
@ -222,7 +230,7 @@ do_install_quick() {
# create filesystem # create filesystem
msg_progress_install "23" "Creating filesystem on ${INSTALL_DEVICE}1" msg_progress_install "23" "Creating filesystem on ${INSTALL_DEVICE}1"
mkfs.vfat ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1 mkfs.vfat -F 16 ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
msg_progress_install "25" "Set uuid and disklabel $DISKLABEL_SYSTEM on ${INSTALL_DEVICE}${PART1}" msg_progress_install "25" "Set uuid and disklabel $DISKLABEL_SYSTEM on ${INSTALL_DEVICE}${PART1}"
dosfslabel ${INSTALL_DEVICE}${PART1} $DISKLABEL_SYSTEM >> $LOGFILE 2>&1 dosfslabel ${INSTALL_DEVICE}${PART1} $DISKLABEL_SYSTEM >> $LOGFILE 2>&1