summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-06-11 14:42:55 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-06-11 14:42:55 +0000
commite2c8529758a43249065aa380e5985406a319d0b5 (patch)
tree65f01b27f645bb6829c2e222ddcb7d88cbca36fd /mdk-stage1
parent90ea8befbeac71a65202fe28dc16350c90d310c7 (diff)
downloaddrakx-e2c8529758a43249065aa380e5985406a319d0b5.tar
drakx-e2c8529758a43249065aa380e5985406a319d0b5.tar.gz
drakx-e2c8529758a43249065aa380e5985406a319d0b5.tar.bz2
drakx-e2c8529758a43249065aa380e5985406a319d0b5.tar.xz
drakx-e2c8529758a43249065aa380e5985406a319d0b5.zip
do not set root=/dev/ram3 from my code anymore, expect the bootloader to set the parameter correctly
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/stage1.c11
-rw-r--r--mdk-stage1/tools.c2
2 files changed, 2 insertions, 11 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index cf973f615..432fc7194 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -399,17 +399,8 @@ int main(int argc, char **argv, char **env)
if (interactive_pid != 0)
kill(interactive_pid, 9);
- if (IS_RESCUE) {
- int fd = open("/proc/sys/kernel/real-root-dev", O_RDWR);
-#if defined(__powerpc__) || defined (__sparc__)
- write(fd, "0x1030000", sizeof("0x1030000")); /* ram3 or sparc */
-#else
- write(fd, "0x103", sizeof("0x103")); /* ram3 */
-#endif
- close(fd);
+ if (IS_RESCUE)
return 66;
- }
-
if (IS_TESTING)
return 0;
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index deafdc8fe..05ec58f92 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -243,7 +243,7 @@ static void save_stuff_for_rescue(void)
enum return_type load_ramdisk_fd(int ramdisk_fd, int size)
{
BZFILE * st2;
- char * ramdisk = "/dev/ram3"; /* warning, verify that this file exists in the initrd (and actually is a ramdisk device file) */
+ char * ramdisk = "/dev/ram3"; /* warning, verify that this file exists in the initrd, and that root=/dev/ram3 is actually passed to the kernel at boot time */
int ram_fd;
char buffer[4096];
int z_errnum;