From 6f14bdedfe57ea658f2952dd6c752fbdbfd04886 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 9 Feb 2012 15:47:05 +0000 Subject: [PATCH 1/1] Adapt RPM build to EL5 git-svn-id: https://svn.argeo.org/slc/trunk@5032 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dist/slc/pom.xml | 4 ++-- dist/slc/src/main/scripts/preinstall-5 | 11 +++++++++++ .../slc/src/main/scripts/{preinstall => preinstall-6} | 3 --- dist/slc/src/main/scripts/{preremove => preremove-5} | 3 --- dist/slc/src/main/scripts/preremove-6 | 6 ++++++ 5 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 dist/slc/src/main/scripts/preinstall-5 rename dist/slc/src/main/scripts/{preinstall => preinstall-6} (72%) rename dist/slc/src/main/scripts/{preremove => preremove-5} (66%) create mode 100644 dist/slc/src/main/scripts/preremove-6 diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml index af3da3790..bf7ea8ce0 100644 --- a/dist/slc/pom.xml +++ b/dist/slc/pom.xml @@ -105,13 +105,13 @@ - src/main/scripts/preinstall + src/main/scripts/preinstall-${rpm.release} src/main/scripts/postinstall - src/main/scripts/preremove + src/main/scripts/preremove-${rpm.release} slc-libs diff --git a/dist/slc/src/main/scripts/preinstall-5 b/dist/slc/src/main/scripts/preinstall-5 new file mode 100644 index 000000000..c51911ab2 --- /dev/null +++ b/dist/slc/src/main/scripts/preinstall-5 @@ -0,0 +1,11 @@ +if [ $1 = "1" ];then + APP=%{name} + + # create application user (EL5) + useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP + + # give read access to group on home + chmod g+r /var/lib/$APP + mkdir -p /var/lib/$APP/{conf,data} + chown $APP.$APP /var/lib/$APP/{conf,data} +fi \ No newline at end of file diff --git a/dist/slc/src/main/scripts/preinstall b/dist/slc/src/main/scripts/preinstall-6 similarity index 72% rename from dist/slc/src/main/scripts/preinstall rename to dist/slc/src/main/scripts/preinstall-6 index b3953fc53..488dac319 100644 --- a/dist/slc/src/main/scripts/preinstall +++ b/dist/slc/src/main/scripts/preinstall-6 @@ -1,9 +1,6 @@ if [ $1 = "1" ];then APP=%{name} - # create application user (EL5) - #useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP - # create application user (EL6) useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP diff --git a/dist/slc/src/main/scripts/preremove b/dist/slc/src/main/scripts/preremove-5 similarity index 66% rename from dist/slc/src/main/scripts/preremove rename to dist/slc/src/main/scripts/preremove-5 index 9fa0a738e..c3c339b10 100644 --- a/dist/slc/src/main/scripts/preremove +++ b/dist/slc/src/main/scripts/preremove-5 @@ -3,7 +3,4 @@ if [ $1 = "0" ];then APP=slc /sbin/chkconfig --del $APP userdel $APP - - # necessary for EL5? (breaks EL6) - #groupdel slc fi diff --git a/dist/slc/src/main/scripts/preremove-6 b/dist/slc/src/main/scripts/preremove-6 new file mode 100644 index 000000000..c3c339b10 --- /dev/null +++ b/dist/slc/src/main/scripts/preremove-6 @@ -0,0 +1,6 @@ +if [ $1 = "0" ];then + #APP=%{name} => doesn't work + APP=slc + /sbin/chkconfig --del $APP + userdel $APP +fi -- 2.39.2