wok diff linux/stuff/linux-subroot.u @ rev 20334

Do not use efi shell (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jun 02 16:13:06 2018 +0200 (20 months ago)
parents ffc20f9bd49f
children
line diff
     1.1 --- a/linux/stuff/linux-subroot.u	Wed Jan 10 15:30:44 2018 +0100
     1.2 +++ b/linux/stuff/linux-subroot.u	Sat Jun 02 16:13:06 2018 +0200
     1.3 @@ -6,9 +6,9 @@
     1.4  ...
     1.5  The bad news : you can't remount /
     1.6  
     1.7 ---- linux-3.2.98/Documentation/kernel-parameters.txt
     1.8 -+++ linux-3.2.98/Documentation/kernel-parameters.txt
     1.9 -@@ -2339,8 +2339,9 @@
    1.10 +--- linux-3.16.53/Documentation/kernel-parameters.txt
    1.11 ++++ linux-3.16.53/Documentation/kernel-parameters.txt
    1.12 +@@ -3017,8 +3017,9 @@
    1.13   
    1.14   	ro		[KNL] Mount root device read-only on boot
    1.15   
    1.16 @@ -19,9 +19,9 @@
    1.17   
    1.18   	rootdelay=	[KNL] Delay (in seconds) to pause before attempting to
    1.19   			mount the root filesystem
    1.20 ---- linux-3.2.40/init/do_mounts.c
    1.21 -+++ linux-3.2.40/init/do_mounts.c
    1.22 -@@ -28,6 +28,7 @@
    1.23 +--- linux-3.16.53/init/do_mounts.c
    1.24 ++++ linux-3.16.53/init/do_mounts.c
    1.25 +@@ -40,6 +40,7 @@
    1.26   int root_mountflags = MS_RDONLY | MS_SILENT;
    1.27   static char * __initdata root_device_name;
    1.28   static char __initdata saved_root_name[64];
    1.29 @@ -29,7 +29,7 @@
    1.30   static int root_wait;
    1.31   
    1.32   dev_t ROOT_DEV;
    1.33 -@@ -255,7 +256,20 @@
    1.34 +@@ -288,7 +289,20 @@
    1.35   
    1.36   static int __init root_dev_setup(char *line)
    1.37   {
    1.38 @@ -50,10 +50,12 @@
    1.39   	return 1;
    1.40   }
    1.41   
    1.42 -@@ -554,5 +568,5 @@
    1.43 +@@ -590,7 +604,7 @@
    1.44   out:
    1.45   	devtmpfs_mount("dev");
    1.46   	sys_mount(".", "/", NULL, MS_MOVE, NULL);
    1.47 --	sys_chroot((const char __user __force *)".");
    1.48 -+	sys_chroot((const char __user __force *)saved_root_directory);
    1.49 +-	sys_chroot(".");
    1.50 ++	sys_chroot(saved_root_directory);
    1.51   }
    1.52 + 
    1.53 + static bool is_tmpfs;