projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't overwrite user modified issue files.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
5ec3d81
..
9040822
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-1240,15
+1240,22
@@
comment_force_overwrite () {
fi
}
fi
}
+# try not to overwrite user modified issue files
fix_issue () {
fix_issue () {
- cat > /etc/issue <<EOF
+ if cmp /etc/issue $cnup/files/etc/issue.expect.lenny >/dev/null; then
+ cp -av /etc/issue /etc/issue.$backup_ext
+ cat > /etc/issue <<EOF
Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
EOF
Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
EOF
+ fi
- cat > /etc/issue.net <<EOF
+ if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.lenny >/dev/null; then
+ cp -av /etc/issue.net /etc/issue.net.$backup_ext
+ cat > /etc/issue.net <<EOF
Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
EOF
Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
EOF
+ fi
}
check_archives_space() {
}
check_archives_space() {