diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-11-29 13:10:08 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-11-29 13:10:08 +0100 |
| commit | a0db6f292cdceec16b928fac8a777745c68a319f (patch) | |
| tree | 8126dc06448121d4232f9a757e00495295b5a659 | |
| parent | 96b319243513c55961641ec3dfcdc32f82dfac76 (diff) | |
| download | drakx-a0db6f292cdceec16b928fac8a777745c68a319f.tar drakx-a0db6f292cdceec16b928fac8a777745c68a319f.tar.gz drakx-a0db6f292cdceec16b928fac8a777745c68a319f.tar.bz2 drakx-a0db6f292cdceec16b928fac8a777745c68a319f.tar.xz drakx-a0db6f292cdceec16b928fac8a777745c68a319f.zip | |
advertize "ext4" rather than "ext2"
| -rw-r--r-- | mdk-stage1/NEWS | 2 | ||||
| -rw-r--r-- | mdk-stage1/disk.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/doc/README | 2 | ||||
| -rw-r--r-- | mdk-stage1/partition.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/rescue-gui.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 3009b3472..746e8fe63 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- advertize "ext4" rather than "ext2" + 2.32 - list_modules: don't include vboxvideo (mga#23467) diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index d9fd92b99..e7c38e27d 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -134,7 +134,7 @@ static enum return_type try_with_device(char *dev_name) /* in testing mode, assume the partition is already mounted on MEDIA_LOCATION */ if (!IS_TESTING && try_mount(choice, MEDIA_LOCATION)) { - stg1_error_message("I can't find a valid filesystem (tried: ext2, vfat, ntfs, reiserfs). " + stg1_error_message("I can't find a valid filesystem (tried: ext4, vfat, ntfs, reiserfs). " "Make sure the partition has been cleanly unmounted."); return try_with_device(dev_name); } diff --git a/mdk-stage1/doc/README b/mdk-stage1/doc/README index 65e0174b4..28b81b39e 100644 --- a/mdk-stage1/doc/README +++ b/mdk-stage1/doc/README @@ -106,7 +106,7 @@ of the easiest way is to grab a local copy of the Distribution on one of your local hard drives, and to install from that location. At present time, you can install from IDE or SCSI drives, from Linux -(ext2), Windows (vfat) or Reiserfs partition. +(ext4), Windows (vfat) or Reiserfs partition. In that case, you'll need to use the "hd.img" image file. The dialogs will ask you to choose the DISK drive to use to install from, then the diff --git a/mdk-stage1/partition.c b/mdk-stage1/partition.c index 83bfc5ce6..cb59f0514 100644 --- a/mdk-stage1/partition.c +++ b/mdk-stage1/partition.c @@ -74,7 +74,7 @@ static const char * detect_partition_type(char * dev) struct partition_detection_info partitions_signatures[] = { { "Linux Swap", { 4086, "SWAP-SPACE" }, { 0, NULL }, { 0, NULL } }, { "Linux Swap", { 4086, "SWAPSPACE2" }, { 0, NULL }, { 0, NULL } }, - { "Ext2", { 0x438, "\x53\xEF" }, { 0, NULL }, { 0, NULL } }, + { "Ext4", { 0x438, "\x53\xEF" }, { 0, NULL }, { 0, NULL } }, { "ReiserFS", { 0x10034, "ReIsErFs" }, { 0, NULL }, { 0, NULL } }, { "ReiserFS", { 0x10034, "ReIsEr2Fs" }, { 0, NULL }, { 0, NULL } }, { "XFS", { 0, "XFSB" }, { 0x200, "XAGF" }, { 0x400, "XAGI" } }, diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c index b96f0ae6e..c7aae6126 100644 --- a/mdk-stage1/rescue-gui.c +++ b/mdk-stage1/rescue-gui.c @@ -153,7 +153,7 @@ void unmount_filesystems(void) for (i = nb = 0; i < numfs; i++) if (fs[i].mounted) { printf("\t%s umount failed\n", fs[i].name); - if (strcmp(fs[i].fs, "ext2") == 0) nb++; /* don't count not-ext2 umount failed */ + if (strcmp(fs[i].fs, "ext4") == 0) nb++; /* don't count not-ext4 umount failed */ } if (nb) { |