[request-sponsor] [PATCH] 6375097 - x86 ramdisk should always contain amd64 kernel and ...

[Shidokht Yadegari]

I'll sponsor this one.

--shidokht

Rob Benson wrote:
> Please find the patch for the following bug below/attached:
>  6375097 - x86 ramdisk should always contain amd64 kernel and binaries.
> 
> Thanks,
> Rob
> OSA# OS0013
> 
> -
> 
> --- create_ramdisk.ksh.orig 2006-01-19 23:33:10.0 -0800
> +++ create_ramdisk.ksh  2006-01-19 23:34:22.0 -0800
> @@ -36,7 +36,6 @@
>  
>  format=ufs
>  ALT_ROOT=
> -NO_AMD64=
>  
>  BOOT_ARCHIVE=platform/i86pc/boot_archive
>  
> @@ -106,9 +105,6 @@
>  
>  function create_ufs
>  {
> -   # should we exclude amd64 binaries?
> -   [ $is_amd64 -eq 0 ] && NO_AMD64="-name amd64 -prune"
> -
> # calculate image size
> getsize
>  
> @@ -122,7 +118,7 @@
>  
> # do the actual copy
> cd /${ALT_ROOT}
> -   find $filelist -print ${NO_AMD64} 2> /dev/null | \
> +   find $filelist -print 2> /dev/null | \
>  cpio -pdum ${rdmnt} 2> /dev/null
> umount ${rdmnt}
> lofiadm -d ${rdfile}
> @@ -132,13 +128,10 @@
>  
>  function create_isofs
>  {
> -   # should we exclude amd64 binaries?
> -   [ $is_amd64 = 0 ] && NO_AMD64="-m amd64"
> -
> # create image directory seed with graft points
> mkdir ${rdmnt}
> files=
> -   isocmd="mkisofs -quiet -graft-points -dlrDJN -relaxed-filenames 
> ${NO_AMD64}"
> +   isocmd="mkisofs -quiet -graft-points -dlrDJN -relaxed-filenames"
> for path in $filelist
> do
> if [ -d ${ALT_ROOT}/$path ]; then
> @@ -172,12 +165,6 @@
>  fi
>  filelist=`cat $files | sort | uniq`
>  
> -#
> -# decide if cpu is amd64 capable
> -#
> -prtconf -v /devices | grep CPU_not_amd64 > /dev/null 2>&1
> -is_amd64=$?
> -
>  echo "updating ${ALT_ROOT}/${BOOT_ARCHIVE}...this may take a minute"
>  
>  if [ $format = "ufs" ]; then
> This message posted from opensolaris.org
> 
> 
> 
> 
> ___
> request-sponsor mailing list
> request-sponsor at opensolaris.org

[request-sponsor] [PATCH] 6375097 - x86 ramdisk should always contain amd64 kernel and ...

[Rob Benson]

Please find the patch for the following bug below/attached:
 6375097 - x86 ramdisk should always contain amd64 kernel and binaries.

Thanks,
Rob
OSA# OS0013

-

--- create_ramdisk.ksh.orig 2006-01-19 23:33:10.0 -0800
+++ create_ramdisk.ksh  2006-01-19 23:34:22.0 -0800
@@ -36,7 +36,6 @@
 
 format=ufs
 ALT_ROOT=
-NO_AMD64=
 
 BOOT_ARCHIVE=platform/i86pc/boot_archive
 
@@ -106,9 +105,6 @@
 
 function create_ufs
 {
-   # should we exclude amd64 binaries?
-   [ $is_amd64 -eq 0 ] && NO_AMD64="-name amd64 -prune"
-
# calculate image size
getsize
 
@@ -122,7 +118,7 @@
 
# do the actual copy
cd /${ALT_ROOT}
-   find $filelist -print ${NO_AMD64} 2> /dev/null | \
+   find $filelist -print 2> /dev/null | \
 cpio -pdum ${rdmnt} 2> /dev/null
umount ${rdmnt}
lofiadm -d ${rdfile}
@@ -132,13 +128,10 @@
 
 function create_isofs
 {
-   # should we exclude amd64 binaries?
-   [ $is_amd64 = 0 ] && NO_AMD64="-m amd64"
-
# create image directory seed with graft points
mkdir ${rdmnt}
files=
-   isocmd="mkisofs -quiet -graft-points -dlrDJN -relaxed-filenames 
${NO_AMD64}"
+   isocmd="mkisofs -quiet -graft-points -dlrDJN -relaxed-filenames"
for path in $filelist
do
if [ -d ${ALT_ROOT}/$path ]; then
@@ -172,12 +165,6 @@
 fi
 filelist=`cat $files | sort | uniq`
 
-#
-# decide if cpu is amd64 capable
-#
-prtconf -v /devices | grep CPU_not_amd64 > /dev/null 2>&1
-is_amd64=$?
-
 echo "updating ${ALT_ROOT}/${BOOT_ARCHIVE}...this may take a minute"
 
 if [ $format = "ufs" ]; then
This message posted from opensolaris.org
-- next part --
A non-text attachment was scrubbed...
Name: create_ramdisk.diff
Type: application/octet-stream
Size: 1340 bytes
Desc: not available
URL: