Subject: Re: [Fwd: lilo-xfs patch]
From: Derek James Witt <djw@flinthills.com>
To: Linux XFS <linux-xfs@oss.sgi.com>
In-Reply-To: <1017093184.1748.32.camel@stout.americas.sgi.com>
In-Reply-To: <1017092300.2173.13.camel@saiya-jin.flinthills.com> 
	<1017093184.1748.32.camel@stout.americas.sgi.com>
Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-cOzvY6JJkswPwgvV9tWz"
Date: 25 Mar 2002 16:52:25 -0600
Message-Id: <1017096745.2172.18.camel@saiya-jin.flinthills.com>
Mime-Version: 1.0
Sender: owner-linux-xfs@oss.sgi.com
Precedence: bulk


--=-cOzvY6JJkswPwgvV9tWz
Content-Type: multipart/mixed; boundary="=-E3OV9iMAwk6Ln+NS+iY5"


--=-E3OV9iMAwk6Ln+NS+iY5
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi, Eric. Thanks for the suggestion. That made it cleaner. Here's the
new patch.

On Mon, 2002-03-25 at 15:53, Eric Sandeen wrote:
> hi Derek -=20
>=20
> Rather than parsing /etc/mtab, it would probably be better to look for
> "XFSB" in the first 4 bytes of the target partition - that way you
> _know_ the target has (or has had....) an xfs filesystem on it.
>=20
> -Eric
>=20
> --=20
> Eric Sandeen      XFS for Linux     http://oss.sgi.com/projects/xfs
> sandeen@sgi.com   SGI, Inc.
--=20
**  Derek J Witt                                              **
*   Email: mailto:djw@flinthills.com                           *
*   Home Page: http://www.flinthills.com/~djw/                 *
*** "...and on the eighth day, God met Bill Gates." - Unknown **

--=-E3OV9iMAwk6Ln+NS+iY5
Content-Disposition: attachment; filename=lilo-xfs.diff
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

--- lilo.c	Sun Dec 30 16:10:26 2001
+++ ../lilo-xfs.c	Mon Mar 25 16:43:40 2002
@@ -755,16 +755,40 @@
     fprintf(errstd,"%7s%s -A /dev/XXX [ N ]\t\tactivate a partition\n","",=
name);
     fprintf(errstd,"%7s%s -M /dev/XXX [ mbr_file ]\tinstall master boot re=
cord\n","",name);
     fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", na=
me);
+    fprintf(errstd,"%7s%s -F \t\t\t\tforce install on XFS partition\n\t\t\=
t\t\tWARNING: This will corrupt\n\t\t\t\t\tthe superblock on XFS partitions=
.\n\n", "", name);
     fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name)=
;
     exit(1);
 }
=20
=20
+int is_xfs(char* device)=20
+{
+    FILE* mounts;
+    unsigned char xfs_sig[] =3D {'X','F','S','B'};
+    int got_xfs =3D 1, i;
+
+    if ((mounts =3D fopen(device, "rb")) =3D=3D NULL)=20
+    {   /* Just some insurance. If this does not exists, there's something
+	   seriously wrong here. How are you even in Linux in the first place?
+	*/
+	die("ERROR: I cannot find %s! Nothing done.\n",device);
+    }
+
+    for (i =3D 0; (i < 4) && (got_xfs =3D=3D 1); i++)=20
+      if (xfs_sig[i] =3D=3D fgetc(mounts)) got_xfs =3D 1; else got_xfs =3D=
 0;
+
+    fclose(mounts);
+
+    return got_xfs;
+}
+
 int main(int argc,char **argv)
 {
     char *name,*reboot_arg,*identify,*ident_opt,*new_root;
     char *tell_param, *uninst_dev, *param, *act1, *act2, ch;
     int query,more,version,uninstall,validate,activate,instmbr,geom;
+    int force_xfs;
+    char *boot_device =3D NULL;
     struct stat st;
     int fd;
     long raid_offset;
@@ -775,6 +799,7 @@
 	    reboot_arg =3D identify =3D ident_opt =3D new_root =3D uninst_dev =3D=
 NULL;
     lowest =3D do_md_install =3D zflag =3D
 	    query =3D version =3D uninstall =3D validate =3D activate =3D instmbr=
 =3D 0;
+    force_xfs =3D 0;
     verbose =3D -1;
     name =3D *argv;
     argc--;
@@ -806,6 +831,8 @@
 		break;
 	    case 'b':
 		cfg_set(cf_options,"boot",param,NULL);
+		boot_device =3D (char*)malloc((sizeof (char)) * 255);
+		strcpy(boot_device,param);
 		break;
 	    case 'c':
 		cfg_set(cf_options,"compact",NULL,NULL);
@@ -823,6 +850,11 @@
 	    case 'f':
 		cfg_set(cf_options,"disktab",param,NULL);
 		break;
+            case 'F':
+	        if (!nowarn)
+		    fprintf(errstd,"WARNING: Forcing install on XFS partitions...\nBe pr=
epared to run xfs_repair\non any XFS root partitions\nthat LILO selects as =
boot.\n");
+		force_xfs =3D 1;
+		break;
 	    case 'g':
 		geometric |=3D 1;
 		break;
@@ -1104,6 +1136,13 @@
 	if (verbose >=3D2 && do_md_install)
 	    printf("raid flags: at bsect_open  0x%02X\n", raid_flags);
=20
+	if (boot_device =3D=3D NULL)
+	{
+	    boot_device =3D (char*)malloc((sizeof (char)) * 255);
+	    strcpy(boot_device,cfg_get_strg(cf_options,"boot"));
+	}
+	if ((is_xfs(boot_device) =3D=3D 1) && (force_xfs =3D=3D 0)) die("root (%s=
) is XFS. Aborted.",boot_device);
+=09
 	bsect_open(cfg_get_strg(cf_options,"boot"),cfg_get_strg(cf_options,"map")=
 ?
 	  cfg_get_strg(cf_options,"map") : MAP_FILE,cfg_get_strg(cf_options,
 	  "install"),cfg_get_strg(cf_options,"delay") ? to_number(cfg_get_strg(

--=-E3OV9iMAwk6Ln+NS+iY5--

--=-cOzvY6JJkswPwgvV9tWz
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQA8n6opgnGXTpcv6TgRAukEAJ4oy7P8iyTeDF973fS4M8YOyjKtowCggtxG
wOvBz2bzZzIhPPrI1rSmlZE=3D
=3DnuxL
-----END PGP SIGNATURE-----

--=-cOzvY6JJkswPwgvV9tWz--