Changeset 470 in ProjectBuilder

Timestamp:

Jun 2, 2008, 7:11:23 PM (16 years ago)

Author:

Bruno Cornec

Message:

• dploy-pxe requires syslinux (at least on rhel 5)
• dploy-pxe adds permission to mount/umount iso images via sudoers
• dploy-pxe now creates all required dirs under /tftpboot
• dploy-dhcp owns the /etc/dhcpd.conf file
• dploy-dhcp doesn't include by default a non-existent /etc/dploy/dhcp.conf file

(Those post install script should become real scripts launched by all install means)

Location:

projects/dploy/pbconf/devel

Files:

• dploy-common/rpm/dploy-common.spec (modified) (1 diff)
• dploy-dhcp/rpm/dploy-dhcp.spec (modified) (1 diff)
• dploy-pxe/rpm/dploy-pxe.spec (modified) (2 diffs)

projects/dploy/pbconf/devel/dploy-common/rpm/dploy-common.spec

@@ -59 +59 @@
 %pre
 # Create dploy Account and group if needed
-grep -qE '^dploy:' /etc/group
+grep -qE '^dploy:' %{_sysconfdir}/group
 if [ $? -ne 0 ]; then
     groupadd dploy
 fi
-grep -qE '^dploy:' /etc/passwd
+grep -qE '^dploy:' %{_sysconfdir}/passwd
 if [ $? -ne 0 ]; then
     useradd -g dploy dploy

projects/dploy/pbconf/devel/dploy-dhcp/rpm/dploy-dhcp.spec

@@ -44 +44 @@
 %post
 # Include our configuration file in std dhcp.conf file
-grep -qE '^include "%{_sysconfdir}/PBPROJ/dhcpd.conf";' /etc/dhcpd.conf
-if [ $? -ne 0 ]; then
-    echo 'include "%{_sysconfdir}/PBPROJ/dhcpd.conf";' >> /etc/dhcpd.conf
-fi
+#grep -qE '^include "%{_sysconfdir}/PBPROJ/dhcpd.conf";' /etc/dhcpd.conf
+#if [ $? -ne 0 ]; then
+    #echo 'include "%{_sysconfdir}/PBPROJ/dhcpd.conf";' >> /etc/dhcpd.conf
+#fi
+
+# Give us the rights to modify the DHCP conf file
+chgrp dploy %{_sysconfdir}/dhcpd.conf
+chmod 664 %{_sysconfdir}/dhcpd.conf
 
 # Include dploy in sudoers
-grep -qE '^dploy ' /etc/sudoers
+grep -qE '^dploy ' %{_sysconfdir}/sudoers | grep %{_sysconfdir}/init.d/dhcpd
 if [ $? -ne 0 ]; then
-    echo 'dploy ALL=NOPASSWD: /etc/init.d/dhcpd ?*' >> /etc/sudoers
+    echo 'dploy ALL=NOPASSWD: /etc/init.d/dhcpd ?*' >> %{_sysconfdir}/sudoers
 fi
 

projects/dploy/pbconf/devel/dploy-pxe/rpm/dploy-pxe.spec

@@ -15 +15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildArch:      noarch
-Requires:       dploy-common, tftp-server, sudo, perl, PBDEP
+Requires:       dploy-common, tftp-server, sudo, perl, syslinux, PBDEP
 
 %description
@@ -43 +43 @@
 
 %post
+# Include dploy in sudoers
+grep -qE '^dploy ' %{_sysconfdir}/sudoers | grep /bin/umount
+if [ $? -ne 0 ]; then
+    echo 'dploy ALL=NOPASSWD: /bin/mount -o loop ?*' >> %{_sysconfdir}/sudoers
+    echo 'dploy ALL=NOPASSWD: /bin/umount ?*' >> %{_sysconfdir}/sudoers
+fi
+
+# Setup all required paths for tftpboot environment
+pathpxe=`grep pathpxe %{_sysconfdir}/PBPROJ/dploy.conf | cut -d= -f2`
+for p in $pathpxe $pathpxe/../mondorescue $pathpxe/../linuxcoe; do
+    if [ ! -d $p ]; then
+        mkdir -p $p
+    fi
+    chgrp dploy $p
+    chmod 775 $p
+done
 
 %changelog