From 388986876373b8d6d9053c36196978464bd3362e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 28 Nov 2018 07:25:32 +0000 Subject: Wed Nov 28 07:25:32 UTC 2018 a/elilo-3.16-x86_64-9.txz: Rebuilt. eliloconfig: don't assume that mount output lists the / partition first. a/f2fs-tools-1.12.0-x86_64-1.txz: Added. a/kernel-generic-4.19.5-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.5-x86_64-1.txz: Upgraded. CRYPTO_CRC32 m -> y F2FS_FS m -> y a/kernel-modules-4.19.5-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-22.txz: Rebuilt. rc.S: if we're using F2FS for the root filesystem, don't try to check it as fsck.f2fs throws an error on trying to check a read-only filesystem. d/clisp-2.49_20181112_df3b9f6fd-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.5-x86-1.txz: Upgraded. k/kernel-source-4.19.5-noarch-1.txz: Upgraded. l/graphite2-1.3.12-x86_64-1.txz: Added. Required by harfbuzz in order to use it as a system library for TeXlive. l/harfbuzz-2.1.3-x86_64-1.txz: Upgraded. Requires graphite2-1.3.12. t/texlive-2018.180822-x86_64-4.txz: Rebuilt. Use system harfbuzz, not the bundled version. isolinux/initrd.img: Rebuilt. Activate LVM volumes at boot, not only when setup is run. Make /etc/mtab a symlink to /proc/mounts on the installer. On a freshly installed system, make /etc/mtab a symlink to /proc/mounts. Include f2fs-tools on the installer. Support installing on F2FS partitions. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- .../sources/initrd/usr/lib/setup/SeTpartitions | 32 ++++++++++++++++++++-- .../installer/sources/initrd/usr/lib/setup/setup | 6 ++++ 2 files changed, 36 insertions(+), 2 deletions(-) (limited to 'source/installer/sources/initrd/usr/lib') diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTpartitions b/source/installer/sources/initrd/usr/lib/setup/SeTpartitions index 34819701f..279edd94a 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTpartitions +++ b/source/installer/sources/initrd/usr/lib/setup/SeTpartitions @@ -17,6 +17,24 @@ crunch () { echo $STRING } +# make_f2fs( dev ) - Create a new f2fs filesystem on the named dev. +# Parameters: dev Device node to format. +make_f2fs() { + # get the size of the named partition + SIZE=`get_part_size $1` + # output a nice status message + dialog --title "FORMATTING" \ + --backtitle "Formatting $1 with filesystem f2fs." \ + --infobox "Formatting $1 \n\ +Size: $SIZE \n\ +Filesystem type: f2fs " 0 0 + # do the format + if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then + umount $1 2> $NDIR + fi + mkfs.f2fs -f $1 1> $REDIR 2> $REDIR +} + # make_btrfs( dev ) - Create a new btrfs filesystem on the named dev. # Parameters: dev Device node to format. make_btrfs() { @@ -220,7 +238,7 @@ to format this partition?" 12 70 3 \ # ask_fs( dev ) - Asks the user the type of filesystem to use for the named # device. Answer in $TMP/return ask_fs() { - unset BTRFS EXT2 EXT3 JFS REISERFS XFS + unset BTRFS EXT2 EXT3 F2FS JFS REISERFS XFS if grep -wq ext2 /proc/filesystems 1> $NDIR 2> $NDIR ; then EXT2="Ext2 is the traditional Linux file system and is fast and stable. " fi @@ -238,6 +256,9 @@ ask_fs() { if grep -wq btrfs /proc/filesystems 1> $NDIR 2> $NDIR ; then BTRFS="Btrfs is a B-tree copy-on-write filesystem. " fi + if grep -wq f2fs /proc/filesystems 1> $NDIR 2> $NDIR ; then + F2FS="F2FS is a Flash-Friendly File System. " + fi # These last two will only be present if the user asked for a special kernel. # They should probably be the default in that case. if grep -wq jfs /proc/filesystems 1> $NDIR 2> $NDIR ; then @@ -251,7 +272,7 @@ dialog --title "SELECT FILESYSTEM FOR $1" \\ --backtitle "Partition $1 will be formatted." \\ --default-item $DEFAULT --menu \\ "Please select the type of filesystem to use for the specified \\ -device. Here are descriptions of the available filesystems: $EXT2 $EXT3 $EXT4 $JFS $REISERFS $XFS" \\ +device. Here are descriptions of the available filesystems: $EXT2 $EXT3 $EXT4 $BTRFS $F2FS $JFS $REISERFS $XFS" \\ 0 0 0 \\ EOF if [ ! "$EXT2" = "" ]; then @@ -272,6 +293,9 @@ EOF if [ ! "$BTRFS" = "" ]; then echo "\"btrfs\" \"Btrfs Copy-on-Write B-tree Filesystem\" \\" >> $TMP/tempscript fi + if [ ! "$F2FS" = "" ]; then + echo "\"f2fs\" \"Flash-Friendly File System\" \\" >> $TMP/tempscript + fi if [ ! "$XFS" = "" ]; then echo "\"xfs\" \"SGI's Journaling Filesystem\" \\" >> $TMP/tempscript fi @@ -352,6 +376,8 @@ if [ ! "$DOFORMAT" = "No" ]; then make_reiserfs $ROOT_DEVICE elif [ "$ROOT_SYS_TYPE" = "btrfs" ]; then make_btrfs $ROOT_DEVICE + elif [ "$ROOT_SYS_TYPE" = "f2fs" ]; then + make_f2fs $ROOT_DEVICE elif [ "$ROOT_SYS_TYPE" = "jfs" ]; then if [ "$DOFORMAT" = "Check" ]; then make_jfs $ROOT_DEVICE "y" @@ -454,6 +480,8 @@ EOF make_reiserfs $NEXT_PARTITION elif [ "$NEXT_SYS_TYPE" = "btrfs" ]; then make_btrfs $NEXT_PARTITION + elif [ "$NEXT_SYS_TYPE" = "f2fs" ]; then + make_f2fs $NEXT_PARTITION elif [ "$NEXT_SYS_TYPE" = "jfs" ]; then if [ "$DOFORMAT" = "Check" ]; then make_jfs $NEXT_PARTITION "y" diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup index f30064a0f..7932fecae 100755 --- a/source/installer/sources/initrd/usr/lib/setup/setup +++ b/source/installer/sources/initrd/usr/lib/setup/setup @@ -304,6 +304,12 @@ to choose packages individually." 4 60 done export MAKETAG; sleep 1 + # On a new system, make /etc/mtab a symlink to /proc/mounts: + if [ ! -r $T_PX/etc/mtab ]; then + mkdir -p $T_PX/etc + ( cd $T_PX/etc ; ln -sf /proc/mounts mtab ) + fi + # Do the package install: if [ -r $TMP/SeTCDdev ]; then # only try to remount media if it's a CD/DVD slackinstall --device `cat $TMP/SeTCDdev` --promptmode $MODE --srcpath `cat $TMP/SeTDS` --mountpoint /var/log/mount --target $T_PX --series $SERIES elif [ -r $TMP/SeTremotesvr ]; then -- cgit v1.2.3