Changeset 1bb43d5 in mainline

Timestamp:

2018-10-04T09:00:21Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f0f8787

Parents:

6404aca

git-author:

Jiri Svoboda <jiri@…> (2018-10-03 20:59:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-04 09:00:21)

Message:

Switch installation file system from MINIX to Ext4 (well, Ext2, actually).

Files:

• boot/grub.pc/i386-pc/core.img (modified) ( previous)
• tools/grub/grub-update.sh (modified) (1 diff)
• tools/grub/mkimage.sh (modified) (1 diff)
• uspace/app/sysinst/sysinst.c (modified) (2 diffs)

tools/grub/grub-update.sh

@@ -45 +45 @@
         platform="$2"
 
-        ./configure --prefix="$builddir/$target-$platform" --target="$target" --with-platform="$platform" || exit 1
+        ./configure --prefix="$builddir/$target-$platform" --target="$target" --with-platform="$platform" --disable-werror || exit 1
         make clean || exit 1
         make install || exit 1

tools/grub/mkimage.sh

@@ -44 +44 @@
     --prefix "$grub_mod_dir" --output "$grub_mod_dir/core.img" \
     --format 'i386-pc' --compression 'auto' --config "$orig_dir/load.cfg" \
-    "minix3" "part_msdos" "biosdisk" "search_fs_uuid"
+    "ext2" "part_msdos" "biosdisk" "search_fs_uuid"

uspace/app/sysinst/sysinst.c

@@ -62 +62 @@
 #define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.0\\ata-c1\\d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
+/** Volume label for the new file system */
+#define INST_VOL_LABEL "HelenOS"
 
 #define MOUNT_POINT "/inst"
@@ -135 +137 @@
         pspec.capacity = cap;
         pspec.pkind = lpk_primary;
-        pspec.fstype = fs_minix; /* Cannot be changed without modifying core.img */
+        pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */
         pspec.mountp = MOUNT_POINT;
+        pspec.label = INST_VOL_LABEL;
 
         rc = fdisk_part_create(fdev, &pspec, &part);