Hello,
/bsd currently replaces /obsd upon installation of a new kernel. That's
not a problem under normal circumstances, but if one accidentally issues
make install twice, /obsd will be the same as the new (i.e., potentially
unbootable) /bsd kernel. How about leaving /obsd alone if /bsd didn't
change?
Index: sys/arch/alpha/conf/Makefile.alpha
===================================================================
RCS file: /cvs/src/sys/arch/alpha/conf/Makefile.alpha,v
retrieving revision 1.85
diff -u -r1.85 Makefile.alpha
--- sys/arch/alpha/conf/Makefile.alpha 18 Nov 2014 01:17:36 -0000 1.85
+++ sys/arch/alpha/conf/Makefile.alpha 11 Jan 2015 23:49:14 -0000
@@ -146,8 +146,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/amd64/conf/Makefile.amd64
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/Makefile.amd64,v
retrieving revision 1.63
diff -u -r1.63 Makefile.amd64
--- sys/arch/amd64/conf/Makefile.amd64 18 Nov 2014 01:11:13 -0000 1.63
+++ sys/arch/amd64/conf/Makefile.amd64 11 Jan 2015 23:49:14 -0000
@@ -150,8 +150,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/armish/conf/Makefile.armish
===================================================================
RCS file: /cvs/src/sys/arch/armish/conf/Makefile.armish,v
retrieving revision 1.49
diff -u -r1.49 Makefile.armish
--- sys/arch/armish/conf/Makefile.armish 4 Oct 2014 18:10:14 -0000
1.49
+++ sys/arch/armish/conf/Makefile.armish 11 Jan 2015 23:49:14 -0000
@@ -157,8 +157,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/armv7/conf/Makefile.armv7
===================================================================
RCS file: /cvs/src/sys/arch/armv7/conf/Makefile.armv7,v
retrieving revision 1.5
diff -u -r1.5 Makefile.armv7
--- sys/arch/armv7/conf/Makefile.armv7 4 Oct 2014 18:10:14 -0000 1.5
+++ sys/arch/armv7/conf/Makefile.armv7 11 Jan 2015 23:49:14 -0000
@@ -154,8 +154,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/aviion/conf/Makefile.aviion
===================================================================
RCS file: /cvs/src/sys/arch/aviion/conf/Makefile.aviion,v
retrieving revision 1.49
diff -u -r1.49 Makefile.aviion
--- sys/arch/aviion/conf/Makefile.aviion 18 Nov 2014 01:17:36 -0000
1.49
+++ sys/arch/aviion/conf/Makefile.aviion 11 Jan 2015 23:49:14 -0000
@@ -151,8 +151,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/hppa/conf/Makefile.hppa
===================================================================
RCS file: /cvs/src/sys/arch/hppa/conf/Makefile.hppa,v
retrieving revision 1.78
diff -u -r1.78 Makefile.hppa
--- sys/arch/hppa/conf/Makefile.hppa 18 Nov 2014 01:17:36 -0000 1.78
+++ sys/arch/hppa/conf/Makefile.hppa 11 Jan 2015 23:49:14 -0000
@@ -156,8 +156,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/hppa64/conf/Makefile.hppa64
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/conf/Makefile.hppa64,v
retrieving revision 1.50
diff -u -r1.50 Makefile.hppa64
--- sys/arch/hppa64/conf/Makefile.hppa64 18 Nov 2014 01:17:36 -0000
1.50
+++ sys/arch/hppa64/conf/Makefile.hppa64 11 Jan 2015 23:49:14 -0000
@@ -148,8 +148,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/i386/conf/Makefile.i386
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/Makefile.i386,v
retrieving revision 1.90
diff -u -r1.90 Makefile.i386
--- sys/arch/i386/conf/Makefile.i386 4 Oct 2014 18:10:14 -0000 1.90
+++ sys/arch/i386/conf/Makefile.i386 11 Jan 2015 23:49:14 -0000
@@ -152,8 +152,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/landisk/conf/Makefile.landisk
===================================================================
RCS file: /cvs/src/sys/arch/landisk/conf/Makefile.landisk,v
retrieving revision 1.51
diff -u -r1.51 Makefile.landisk
--- sys/arch/landisk/conf/Makefile.landisk 4 Oct 2014 18:10:14 -0000
1.51
+++ sys/arch/landisk/conf/Makefile.landisk 11 Jan 2015 23:49:14 -0000
@@ -146,8 +146,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/loongson/conf/Makefile.loongson
===================================================================
RCS file: /cvs/src/sys/arch/loongson/conf/Makefile.loongson,v
retrieving revision 1.43
diff -u -r1.43 Makefile.loongson
--- sys/arch/loongson/conf/Makefile.loongson 18 Nov 2014 01:17:37 -0000
1.43
+++ sys/arch/loongson/conf/Makefile.loongson 11 Jan 2015 23:49:14 -0000
@@ -160,8 +160,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/luna88k/conf/Makefile.luna88k
===================================================================
RCS file: /cvs/src/sys/arch/luna88k/conf/Makefile.luna88k,v
retrieving revision 1.57
diff -u -r1.57 Makefile.luna88k
--- sys/arch/luna88k/conf/Makefile.luna88k 18 Nov 2014 01:17:37 -0000
1.57
+++ sys/arch/luna88k/conf/Makefile.luna88k 11 Jan 2015 23:49:14 -0000
@@ -151,8 +151,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/macppc/conf/Makefile.macppc
===================================================================
RCS file: /cvs/src/sys/arch/macppc/conf/Makefile.macppc,v
retrieving revision 1.69
diff -u -r1.69 Makefile.macppc
--- sys/arch/macppc/conf/Makefile.macppc 4 Oct 2014 18:10:14 -0000
1.69
+++ sys/arch/macppc/conf/Makefile.macppc 11 Jan 2015 23:49:14 -0000
@@ -146,8 +146,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/octeon/conf/Makefile.octeon
===================================================================
RCS file: /cvs/src/sys/arch/octeon/conf/Makefile.octeon,v
retrieving revision 1.19
diff -u -r1.19 Makefile.octeon
--- sys/arch/octeon/conf/Makefile.octeon 18 Nov 2014 01:17:37 -0000
1.19
+++ sys/arch/octeon/conf/Makefile.octeon 11 Jan 2015 23:49:14 -0000
@@ -160,8 +160,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/sgi/conf/Makefile.sgi
===================================================================
RCS file: /cvs/src/sys/arch/sgi/conf/Makefile.sgi,v
retrieving revision 1.67
diff -u -r1.67 Makefile.sgi
--- sys/arch/sgi/conf/Makefile.sgi 18 Nov 2014 01:17:37 -0000 1.67
+++ sys/arch/sgi/conf/Makefile.sgi 11 Jan 2015 23:49:14 -0000
@@ -160,8 +160,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/socppc/conf/Makefile.socppc
===================================================================
RCS file: /cvs/src/sys/arch/socppc/conf/Makefile.socppc,v
retrieving revision 1.40
diff -u -r1.40 Makefile.socppc
--- sys/arch/socppc/conf/Makefile.socppc 4 Oct 2014 18:10:14 -0000
1.40
+++ sys/arch/socppc/conf/Makefile.socppc 11 Jan 2015 23:49:14 -0000
@@ -146,8 +146,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/solbourne/conf/Makefile.solbourne
===================================================================
RCS file: /cvs/src/sys/arch/solbourne/conf/Makefile.solbourne,v
retrieving revision 1.45
diff -u -r1.45 Makefile.solbourne
--- sys/arch/solbourne/conf/Makefile.solbourne 18 Nov 2014 01:17:37 -0000
1.45
+++ sys/arch/solbourne/conf/Makefile.solbourne 11 Jan 2015 23:49:14 -0000
@@ -146,8 +146,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/sparc/conf/Makefile.sparc
===================================================================
RCS file: /cvs/src/sys/arch/sparc/conf/Makefile.sparc,v
retrieving revision 1.82
diff -u -r1.82 Makefile.sparc
--- sys/arch/sparc/conf/Makefile.sparc 18 Nov 2014 01:17:37 -0000 1.82
+++ sys/arch/sparc/conf/Makefile.sparc 11 Jan 2015 23:49:14 -0000
@@ -150,8 +150,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/sparc64/conf/Makefile.sparc64
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/conf/Makefile.sparc64,v
retrieving revision 1.70
diff -u -r1.70 Makefile.sparc64
--- sys/arch/sparc64/conf/Makefile.sparc64 18 Nov 2014 01:17:37 -0000
1.70
+++ sys/arch/sparc64/conf/Makefile.sparc64 11 Jan 2015 23:49:14 -0000
@@ -147,8 +147,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/vax/conf/Makefile.vax
===================================================================
RCS file: /cvs/src/sys/arch/vax/conf/Makefile.vax,v
retrieving revision 1.72
diff -u -r1.72 Makefile.vax
--- sys/arch/vax/conf/Makefile.vax 4 Oct 2014 18:10:14 -0000 1.72
+++ sys/arch/vax/conf/Makefile.vax 11 Jan 2015 23:49:14 -0000
@@ -147,8 +147,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
Index: sys/arch/zaurus/conf/Makefile.zaurus
===================================================================
RCS file: /cvs/src/sys/arch/zaurus/conf/Makefile.zaurus,v
retrieving revision 1.52
diff -u -r1.52 Makefile.zaurus
--- sys/arch/zaurus/conf/Makefile.zaurus 4 Oct 2014 18:10:15 -0000
1.52
+++ sys/arch/zaurus/conf/Makefile.zaurus 11 Jan 2015 23:49:14 -0000
@@ -154,8 +154,7 @@
install: install-kernel-${MACHINE_NAME}
.if !target(install-kernel-${MACHINE_NAME}})
install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
+ cmp -s bsd /bsd || ln -f /bsd /obsd
cp bsd /nbsd
mv /nbsd /bsd
.endif
--
Simon Nicolussi <si...@sinic.name>
http{s,}://{www.,}sinic.name/
