diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-06-25 12:10:09 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-06-25 12:56:05 (EDT) |
| commit | 44a920821939fdd6a5c4a0c66c533f92c5a884bd (patch) | |
| tree | ad5360d0a74c3ce6c461d542dadec2ac60d607a3 | |
| parent | 5a507fa874a1a85800e922e3ce4163035341d81f (diff) | |
busybox: Don't provide /var/www/index.html.
| -rwxr-xr-x | busybox.pkg/postinst | 14 | ||||
| -rwxr-xr-x | busybox.pkg/prerm | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/busybox.pkg/postinst b/busybox.pkg/postinst index f77b149..c003561 100755 --- a/busybox.pkg/postinst +++ b/busybox.pkg/postinst @@ -5,20 +5,6 @@ if [ "x${1}" = 'xconfigure' ]; then update-alternatives --install "${link}" "${name}" \ "${link}.busybox" "${prio}" done </usr/share/busybox/alternatives - if [ "x$(ls -A /var/www/ | head -n 1)" = 'x' ]; then - # There are no files in /var/www/. - cp /usr/share/busybox/www/index.html /var/www/index.html - sha256sum /var/www/index.html >/usr/share/busybox/www/SHA256SUMS - elif [ -f /var/www/index.html ] && \ - [ -f /usr/share/busybox/www/SHA256SUMS ]; then - if sha256sum -cs /usr/share/busybox/www/SHA256SUMS; then - # /var/www/index.html exists and hasn't been modified by - # the user. - cp /usr/share/busybox/www/index.html /var/www/index.html - sha256sum /var/www/index.html \ - >/usr/share/busybox/www/SHA256SUMS - fi - fi if ! [ -f /etc/rc.policy ]; then if [ "x$(cat /etc/proteanos_plat)" = 'xdev' ]; then printf 'disabled\n' >/etc/rc.policy diff --git a/busybox.pkg/prerm b/busybox.pkg/prerm index 160a2d7..96a3db6 100755 --- a/busybox.pkg/prerm +++ b/busybox.pkg/prerm @@ -9,4 +9,14 @@ if [ "x${1}" = 'xupgrade' ]; then while read link name prio; do update-alternatives --remove "${name}" "${link}.busybox" done </usr/share/busybox/alternatives + if [ -f /usr/share/busybox/www/SHA256SUMS ]; then + if [ -f /var/www/index.html ] && \ + sha256sum -cs /usr/share/busybox/www/SHA256SUMS + then + # /var/www/index.html exists and hasn't been modified by + # the user. + rm /var/www/index.html + fi + rm /usr/share/busybox/www/SHA256SUMS + fi fi |