Skip to contentSkip to conversation

sparc32: remove '-s' boot argument

PATCH Applied Martin Habets 2 participants 4 messages Oct 12, 2006 – Oct 17, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc32: remove '-s' boot argument

The '-s' boot argument is not working and not needed. Users should use argument 's' or '1' to boot into single user mode.
This patch removes the remains of the '-s' argument.

Martin

---
Index: linux/arch/sparc/kernel/setup.c
=================================--- linux.orig/arch/sparc/kernel/setup.c 2006-10-12 13:07:14.000000000 +0100
+++ linux/arch/sparc/kernel/setup.c 2006-10-12 13:14:35.000000000 +0100
@@ -104,7 +104,6 @@

unsigned int boot_flags __initdata = 0;
#define BOOTME_DEBUG 0x1
-#define BOOTME_SINGLE 0x2

/* Exported for mm/init.c:paging_init. */ unsigned long cmdline_memory_size __initdata = 0;
@@ -132,9 +131,6 @@
case 'd':
boot_flags |= BOOTME_DEBUG; break;
- case 's':
- boot_flags |= BOOTME_SINGLE;
- break;
case 'h':
prom_printf("boot_flags_init: Halt!\n"); prom_halt();

Applied
#1 lore raw

From: Martin Habets <[email protected]>
Date: Thu, 12 Oct 2006 16:22:43 +0100

Quoted 7 lines

The '-s' boot argument is not working and not needed. Users should use argument 's' or '1' to boot into single user mode.
This patch removes the remains of the '-s' argument.

Martin

Applied, and I killed it from sparc64 too.

#2 lore raw
In reply to Martin Habets
Quoted 7 lines · David Miller

From: Martin Habets <[email protected]>
Date: Thu, 12 Oct 2006 16:22:43 +0100

Quoted 4 lines

The '-s' boot argument is not working and not needed. Users should use argument 's' or '1' to boot into single user mode.
This patch removes the remains of the '-s' argument.

Quoted 5 lines
Quoted 3 lines

Martin

Applied, and I killed it from sparc64 too.

I'm afraid my patch was not correct. Although the kernel does nothing with this flag, init does honour it and boots into single user mode. Adding the case statement back prevents the kernel from printing the message "Unknown boot switch (-s)" from the default case.

I did a sparc64 patch as well this time.

Martin

---
Index: linux/arch/sparc/kernel/setup.c
=================================--- linux.orig/arch/sparc/kernel/setup.c 2006-10-13 16:16:46.000000000 +0100
+++ linux/arch/sparc/kernel/setup.c 2006-10-13 16:18:13.000000000 +0100
@@ -131,6 +131,9 @@
case 'd':
boot_flags |= BOOTME_DEBUG; break;
+ case 's':
+ /* init honours this flag to boot into single user mode */
+ break;
case 'h':
prom_printf("boot_flags_init: Halt!\n"); prom_halt();
Index: linux/arch/sparc64/kernel/setup.c
=================================--- linux.orig/arch/sparc64/kernel/setup.c 2006-10-13 16:19:16.000000000 +0100
+++ linux/arch/sparc64/kernel/setup.c 2006-10-13 16:20:21.000000000 +0100
@@ -110,6 +110,9 @@
case 'd':
boot_flags |= BOOTME_DEBUG; break;
+ case 's':
+ /* init honours this flag to boot into single user mode */
+ break;
case 'h':
prom_printf("boot_flags_init: Halt!\n"); prom_halt();

#3 lore raw
In reply to Martin Habets

From: Martin Habets <[email protected]>
Date: Fri, 13 Oct 2006 16:26:14 +0100

Quoted 8 lines

I'm afraid my patch was not correct. Although the kernel does nothing with this flag, init does honour it and boots into single user mode. Adding the case statement back prevents the kernel from printing the message "Unknown boot switch (-s)" from the default case.

I did a sparc64 patch as well this time.

Thanks Martin.

Instead of having all of these changes going back and forth, I'm just going to code up one changeset that does it right :)