From 9268b3b5958c91b7865d258699d7ada73dfb83ce Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Sat, 13 Jun 2009 15:45:57 +0000 Subject: [PATCH] Revert "Explicitly support sun4v (Niagara systems) in silo.conf" Silo does not seem to understand sun4v. --- data/lenny/sparc/silo.conf | 8 ++++---- data/squeeze/sparc/silo.conf | 8 ++++---- debian/changelog | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/data/lenny/sparc/silo.conf b/data/lenny/sparc/silo.conf index 0d5acb80..516e81cc 100644 --- a/data/lenny/sparc/silo.conf +++ b/data/lenny/sparc/silo.conf @@ -4,14 +4,14 @@ message=/boot/debian.txt default=install ### sparc64 boot images -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=install initrd=/boot/initrd.gz image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt" label=install # sparc64 expert boots -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=expert initrd=/boot/initrd.gz append="debconf/priority=low" @@ -19,7 +19,7 @@ image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt" label=expert # sparc64 rescue boots -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=rescue initrd=/boot/initrd.gz append="rescue/enable=true" @@ -27,7 +27,7 @@ image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt" label=rescue # sparc64 auto-install boots -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=auto initrd=/boot/initrd.gz append="auto=true priority=critical" diff --git a/data/squeeze/sparc/silo.conf b/data/squeeze/sparc/silo.conf index 0d5acb80..516e81cc 100644 --- a/data/squeeze/sparc/silo.conf +++ b/data/squeeze/sparc/silo.conf @@ -4,14 +4,14 @@ message=/boot/debian.txt default=install ### sparc64 boot images -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=install initrd=/boot/initrd.gz image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt" label=install # sparc64 expert boots -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=expert initrd=/boot/initrd.gz append="debconf/priority=low" @@ -19,7 +19,7 @@ image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt" label=expert # sparc64 rescue boots -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=rescue initrd=/boot/initrd.gz append="rescue/enable=true" @@ -27,7 +27,7 @@ image[sun4,sun4c,sun4d,sun4m]="cat /boot/notsupported.txt" label=rescue # sparc64 auto-install boots -image[sun4u,sun4v]=/boot/sparc64 +image[sun4u]=/boot/sparc64 label=auto initrd=/boot/initrd.gz append="auto=true priority=critical" diff --git a/debian/changelog b/debian/changelog index d5c031f5..72863389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ debian-cd (3.1.3) UNRELEASED; urgency=low There are no significant changes in generated CD/DVD images. * Split out code for workaround for #505243 to x86-desktop function library. * sparc: display message for unsupported subarchitectures. - * sparc: explicitly support sun4v (Niagara systems) in silo.conf. -- Frans Pop Sat, 13 Jun 2009 16:48:51 +0200