14906 AMD CPU microcode files should not be flagged with 'preserve'

Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@fingolfin.org>

2 files changed, 25 insertions, 26 deletions

diff --git a/usr/src/data/ucode/update.amd b/usr/src/data/ucode/update.amd
index 132832ca22..55a2894211 100755
--- a/usr/src/data/ucode/update.amd
+++ b/usr/src/data/ucode/update.amd
@@ -141,8 +141,7 @@ rm -f $mf.tmp
 for f in amd/*; do
 	bf=${f##*/}
 	[[ $bf = THIRDPARTYLICENSE* ]] && continue
-	echo "file path=$FW/$bf group=sys mode=0444"\
-	    "reboot-needed=true preserve=true" >> $mf
+	echo "file path=$FW/$bf group=sys mode=0444 reboot-needed=true" >> $mf
 done
 
 sed -i "/pkg.fmri.*microcode\/amd@/s/@[0-9]*/@$ver/" $mf
diff --git a/usr/src/pkg/manifests/system-microcode-amd.p5m b/usr/src/pkg/manifests/system-microcode-amd.p5m
index a3d8fb95eb..a79641cbc4 100644
--- a/usr/src/pkg/manifests/system-microcode-amd.p5m
+++ b/usr/src/pkg/manifests/system-microcode-amd.p5m
@@ -46,53 +46,53 @@ dir  path=platform/i86pc group=sys
 dir  path=platform/i86pc/ucode group=sys
 dir  path=platform/i86pc/ucode/AuthenticAMD group=sys
 file path=platform/i86pc/ucode/AuthenticAMD/1020-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1022-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1041-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1043-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1062-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1080-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1081-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/10A0-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/2031-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/3010-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/5010-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/5020-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/6012-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/6020-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/6101-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/7001-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/8012-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/8082-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/8310-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/A010-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/A011-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/A012-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/container group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/equivalence-table group=sys \
-    mode=0444 preserve=true reboot-needed=true
+    mode=0444 reboot-needed=true
 license lic_CDDL license=lic_CDDL
 license usr/src/data/ucode/amd/THIRDPARTYLICENSE \
     license=usr/src/data/ucode/amd/THIRDPARTYLICENSE