From 0c2157aea5574d689eff7852b8ef6d3605fecfa2 Mon Sep 17 00:00:00 2001 From: mglae Date: Sat, 21 Mar 2020 11:44:52 +0100 Subject: [PATCH 1/3] dosfstools: fsck.fat: reduce log spam, no backup boot sector diff in automatic mode --- ...s-01-silence_backup_boot_sector_diff.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/sysutils/dosfstools/patches/dosfstools-01-silence_backup_boot_sector_diff.patch diff --git a/packages/sysutils/dosfstools/patches/dosfstools-01-silence_backup_boot_sector_diff.patch b/packages/sysutils/dosfstools/patches/dosfstools-01-silence_backup_boot_sector_diff.patch new file mode 100644 index 0000000000..2fe329dc55 --- /dev/null +++ b/packages/sysutils/dosfstools/patches/dosfstools-01-silence_backup_boot_sector_diff.patch @@ -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) From f572a06c14463ef3f3a8202fe48f934ab150e32c Mon Sep 17 00:00:00 2001 From: mglae Date: Sat, 21 Mar 2020 11:46:09 +0100 Subject: [PATCH 2/3] installer: Use FAT16 file system on system partition. --- packages/tools/installer/scripts/installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index 9e166eafd7..faa778abb8 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -206,7 +206,7 @@ do_install_quick() { partsize_storage_end=-1024 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 + parted -s $INSTALL_DEVICE unit s mkpart primary fat16 -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1 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 @@ -222,7 +222,7 @@ do_install_quick() { # create filesystem 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}" dosfslabel ${INSTALL_DEVICE}${PART1} $DISKLABEL_SYSTEM >> $LOGFILE 2>&1 From 4bf7d1d07d0184bf7c23ad84379d95289f069db4 Mon Sep 17 00:00:00 2001 From: mglae Date: Sat, 21 Mar 2020 11:46:20 +0100 Subject: [PATCH 3/3] installer: on GPT set partition labels to defined names instead of using "primary" string --- packages/tools/installer/scripts/installer | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index faa778abb8..1ec9905ac1 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -206,10 +206,18 @@ do_install_quick() { partsize_storage_end=-1024 msg_progress_install "10" "Creating partition on $INSTALL_DEVICE" - parted -s $INSTALL_DEVICE unit s mkpart primary fat16 -- $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" - 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" parted -s $INSTALL_DEVICE set 1 boot on >> $LOGFILE 2>&1