aboutsummaryrefslogtreecommitdiff
path: root/util-linux/fdisk.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/fdisk.c')
-rw-r--r--util-linux/fdisk.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 8c7225816..55f716657 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1914,9 +1914,9 @@ sgi_set_swappartition(int i)
1914static int 1914static int
1915sgi_check_bootfile(const char* aFile) 1915sgi_check_bootfile(const char* aFile)
1916{ 1916{
1917 if (strlen(aFile) < 3) /* "/a\n" is minimum */ { 1917 if (strlen(aFile) < 3) /* "/a\n" is minimum */ {
1918 printf(_("\nInvalid Bootfile!\n" 1918 printf(_("\nInvalid Bootfile!\n"
1919 "\tThe bootfile must be an absolute non-zero pathname,\n" 1919 "\tThe bootfile must be an absolute non-zero pathname,\n"
1920 "\te.g. \"/unix\" or \"/unix.save\".\n")); 1920 "\te.g. \"/unix\" or \"/unix.save\".\n"));
1921 return 0; 1921 return 0;
1922 } else { 1922 } else {
@@ -1931,7 +1931,7 @@ sgi_check_bootfile(const char* aFile)
1931 return 0; 1931 return 0;
1932 } 1932 }
1933 } 1933 }
1934 } 1934 }
1935 if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) { 1935 if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) {
1936 printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t" 1936 printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t"
1937 "SGI's default is \"/unix\" and for backup \"/unix.save\".\n")); 1937 "SGI's default is \"/unix\" and for backup \"/unix.save\".\n"));
@@ -2505,7 +2505,7 @@ static const struct systypes sun_sys_types[] = {
2505 { "\x83" "Linux native" }, /* LINUX_NATIVE */ 2505 { "\x83" "Linux native" }, /* LINUX_NATIVE */
2506 { "\x8e" "Linux LVM" }, /* 0x8e */ 2506 { "\x8e" "Linux LVM" }, /* 0x8e */
2507/* New (2.2.x) raid partition with autodetect using persistent superblock */ 2507/* New (2.2.x) raid partition with autodetect using persistent superblock */
2508 { "\xfd" "Linux raid autodetect" }, /* 0xfd */ 2508 { "\xfd" "Linux raid autodetect" }, /* 0xfd */
2509 { NULL } 2509 { NULL }
2510}; 2510};
2511 2511
@@ -3080,14 +3080,14 @@ sun_list_table(int xtra)
3080 uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; 3080 uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
3081 uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors); 3081 uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
3082 printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n", 3082 printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n",
3083 partname(disk_device, i+1, w), /* device */ 3083 partname(disk_device, i+1, w), /* device */
3084 (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */ 3084 (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */
3085 (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ', 3085 (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',
3086 (long) scround(start), /* start */ 3086 (long) scround(start), /* start */
3087 (long) scround(start+len), /* end */ 3087 (long) scround(start+len), /* end */
3088 (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */ 3088 (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */
3089 sunlabel->infos[i].id, /* type id */ 3089 sunlabel->infos[i].id, /* type id */
3090 partition_type(sunlabel->infos[i].id)); /* type name */ 3090 partition_type(sunlabel->infos[i].id)); /* type name */
3091 } 3091 }
3092 } 3092 }
3093} 3093}
@@ -4280,8 +4280,8 @@ get_partition(int warn, int max)
4280 if (warn) { 4280 if (warn) {
4281 if ( 4281 if (
4282 ( 4282 (
4283 label_sun != current_label_type && 4283 label_sun != current_label_type &&
4284 label_sgi != current_label_type && 4284 label_sgi != current_label_type &&
4285 !pe->part_table->sys_ind 4285 !pe->part_table->sys_ind
4286 ) 4286 )
4287#ifdef CONFIG_FEATURE_SUN_LABEL 4287#ifdef CONFIG_FEATURE_SUN_LABEL