--- rpms/e-smith-base/sme8/e-smith-base.spec 2007/07/03 02:55:13 1.6 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/10/11 21:56:51 1.105 @@ -1,68 +1,50 @@ +# $Id: e-smith-base.spec,v 1.104 2010/10/11 17:19:05 vip-ire Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.18.0 -%define release 63 +%define version 5.2.0 +%define release 35 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-4.18.0-backtitle.patch -Patch2: e-smith-base-4.18.0-consolebackup.patch -Patch3: e-smith-base-4.18.0-backupcancel.patch -Patch4: e-smith-base-4.18.0-gatewaydev.patch -Patch5: e-smith-base-4.18.0-elinks_caching.patch -Patch6: e-smith-base-4.18.0-unused_templates.patch -Patch7: e-smith-base-4.18.0-backuphome.patch -Patch8: e-smith-base-4.18.0-mediaglob.patch -Patch9: e-smith-base-4.18.0-setbeforeexpand.patch -Patch10: e-smith-base-4.18.0-runit17.patch -Patch11: e-smith-base-4.18.0-infobox.patch -Patch12: e-smith-base-4.18.0-infobox.patch2 -Patch13: e-smith-base-4.18.0-mediaglob.patch2 -Patch14: e-smith-base-4.18.0-run.static.patch -Patch15: e-smith-base-4.18.0-ethdriver.patch -Patch16: e-smith-base-4.18.0-ethdriver.patch2 -Patch17: e-smith-base-4.18.0-ethdriver.patch3 -Patch18: e-smith-base-4.18.0-ethdriver.patch4 -Patch19: e-smith-base-4.18.0-raid_no.patch -Patch20: e-smith-base-4.18.0-commonname.patch -Patch21: e-smith-base-4.18.0-noutf.patch -Patch22: e-smith-base-4.18.0-commonname.patch2 -Patch23: e-smith-base-4.18.0-pamtemplate.patch -Patch24: e-smith-base-4.18.0-pamtemplate.patch2 -Patch25: e-smith-base-4.18.0-rcscript.patch -Patch26: e-smith-base-4.18.0-logfile_rotation.patch -Patch27: e-smith-base-4.18.0-login_pam.patch -Patch28: e-smith-base-4.18.0-depmod.patch -Patch29: e-smith-base-4.18.0-perms.patch -Patch30: e-smith-base-4.18.0-dhcpd_perms.patch -Patch31: e-smith-base-4.18.0-noraid.patch -Patch32: e-smith-base-4.18.0-suborder.patch -Patch33: e-smith-base-4.18.0-standby.patch -Patch34: e-smith-base-4.18.0-usbback.patch -Patch35: e-smith-base-4.18.0-remoteaccess.pmfm2self.patch -Patch36: e-smith-base-4.18.0-SSHport.patch -Patch37: e-smith-base-4.18.0-gateway_validation.patch -Patch38: e-smith-base-4.18.0-service_re.patch -Patch39: e-smith-base-4.18.0-xencons.patch -Patch40: e-smith-base-4.18.0-lib64.patch -Patch41: e-smith-base-4.18.0-cracklib.patch -Patch42: e-smith-base-4.18.0-raid_no.patch2 -Patch43: e-smith-base-4.18.0-raidfix.patch -Patch44: e-smith-base-4.18.0-bootstrap.patch -Patch45: e-smith-base-4.18.0-pamtemplate.patch3 -Patch46: e-smith-base-4.18.0-restoredev.patch -Patch47: e-smith-base-4.18.0-no_kmodule.patch -Patch48: e-smith-base-4-18-0-MovePam_d_ftpTemplates.patch -Patch49: e-smith-base-4.18.0-usbback_errcheck.patch -Patch50: e-smith-base-4.18.0-devicechk.patch +Patch1: e-smith-base-5.2.0-sambaRole.patch +Patch2: e-smith-base-5.2.0-smartd40.patch +Patch3: e-smith-base-5.2.0-usbRev70drive.patch +Patch4: e-smith-base-5.2.0-FixLabelArray.patch +Patch5: e-smith-base-5.2.0-straysymlink.patch +Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch +Patch7: e-smith-base-5.2.0-checkIPOverlap.patch +Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch +Patch9: e-smith-base-5.2.0-FixLocale_External.patch +Patch10: e-smith-base-5.2.0-perform_restore-hal.patch +Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch +Patch12: e-smith-base-5.2.0-perform_backup-hal.patch +Patch13: e-smith-base-5.2.0-hwaddress.patch +Patch14: e-smith-base-5.2.0-sha1.patch +Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch +Patch16: e-smith-base-5.2.0-gettext.patch +Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch +Patch18: e-smith-base-5.2.0-no-nic.patch +Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch +Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch +Patch21: e-smith-base-5.2.0-condrestart.patch +Patch22: e-smith-base-5.2.0-condrestart.patch2 +Patch23: e-smith-base-5.2.0-cpuspeed.patch +Patch24: e-smith-base-5.2.0-nss_ldap.patch +Patch25: e-smith-base-5.2.0-ibay_groups.patch +Patch26: e-smith-base-5.2.0-keep_external.patch +Patch27: e-smith-base-5.2.0-checkMaxUsers.patch +Patch28: e-smith-base-5.2.0-apmd64bit.patch +Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch +Patch30: e-smith-base-5.2.0-echo-options.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-7 +Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager -Requires: e-smith-formmagick >= 0.2.0 +Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 Requires: e-smith-daemontools >= 1.7.1-04 Requires: perl(Locale::gettext) @@ -73,10 +55,10 @@ Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance Requires: /usr/sbin/cpuspeed Requires: /sbin/microcode_ctl +Requires: /usr/sbin/smartd Requires: dbus Requires: hal Requires: acpid -Requires: whiptail Requires: rssh Requires: bridge-utils Requires: vconfig @@ -84,13 +66,12 @@ Requires: e-smith-bootloader Requires: mdadm Requires: pv Requires: pam_abl +Requires: nss_ldap Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -%if "%{?rhel}" == "5" Obsoletes: perl-Data-UUID -%endif BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -105,7 +86,328 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Sun Jul 1 2007 Shad L. Lords 4.18.0-62 +* Mon Oct 11 2010 Shad L. Lords 5.2.0-35.sme +- Make lcp options configurable [SME: 6277] + +* Mon Oct 11 2010 Daniel Berteaud 5.2.0-34.sme +- Relocate dhclient conf file [SME: 5833] + +* Fri Oct 8 2010 Shad L. Lords 5.2.0-33.sme +- Disable apmd on 64-bit arch [SME: 6170] + +* Fri Oct 8 2010 Shad L. Lords 5.2.0-32.sme +- Remove check for maxUsers [SME: 5537] + +* Wed Oct 6 2010 Shad L. Lords 5.2.0-31.sme +- Try and keep same external address for pppoe connections [SME: 6263] + +* Mon Sep 27 2010 Shad L. Lords 5.2.0-30.sme +- Add ibay groups to group membership [SME: 6247] + +* Thu Sep 23 2010 Daniel Berteaud 5.2.0-29.sme +- Prepare nss_ldap [SME: 6227] + +* Sun Aug 8 2010 Ian Wells 5.2.0-28.sme +- Enable cpuspeed by default [SME: 6066] + +* Sun Jul 25 2010 Charlie Brady 5.2.0-27.sme +- Fix syntax error in last patch. [SME: 5830] + +* Mon Jul 19 2010 Charlie Brady 5.2.0-26.sme +- Don't exit 99 from e-smith-service script when called with 'condrestart' + and service is disabled. [SME: 5830] + +* Fri Jun 11 2010 Federico Simoncelli 5.2.0-25.sme +- FreeBusy patch fix (save account changes) [SME: 5941] + +* Fri Jun 11 2010 Ian Wells 5.2.0-24.sme +- Remove checkMaxUsers patch due to regression. [SME: 5537] + +* Tue Jun 8 2010 Jonathan Martens 5.2.0-23.sme +- Fix translation of local nic string in console [SME: 5571] + +* Sun Jun 6 2010 Jonathan Martens 5.2.0-22.sme +- Handle no network interface scenario in console [SME: 6023] + +* Sat Jun 5 2010 Ian Wells 5.2.0-21.sme +- Remove checkMaxUsers(). [SME: 5537] + +* Mon May 10 2010 John H. Bennett III 5.2.0-20.sme +- Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941] + +* Wed Mar 3 2010 Federico Simoncelli 5.2.0-19.sme +- Restate smartd dependency. [SME: 5814] + +* Mon Mar 1 2010 Shad L. Lords 5.2.0-18.sme +- Fix gettext errors in WAN/LAN subnet error message [SME: 5501] + +* Sun Feb 14 2010 Jonathan Martens 5.2.0-17.sme +- Really fix template expansion error [SME: 4528] + +* Sun Feb 14 2010 Jonathan Martens 5.2.0-16.sme +- Fix template expansion error [SME: 4528] + +* Mon Feb 8 2010 Jonathan Martens 5.2.0-15.sme +- Improve security by using SHA1 algorithm for certificate signing [SME: 5737] + +* Fri Feb 5 2010 Stephen Noble 5.2.0-14.sme +- Fix eth? swapping [SME: 4528] + +* Sun Jan 31 2010 Stephen Noble 5.2.0-13.sme +- Fix console backup from removable media [SME: 4809] + +* Sat Jan 30 2010 Jonathan Martens 5.2.0-12.sme +- Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735] + +* Thu Jan 14 2010 Filippo Carletti 5.2.0-11.sme +- Fix console restore from removable media (Federico Simoncelli) [SME: 4809] + +* Mon Nov 23 2009 Gavin Weight 5.2.0-10.sme +- Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571] + +* Fri Nov 6 2009 Jonathan Martens 5.2.0-9.sme +- Translate $ifName in console configuration pages [SME: 5571] + +* Sat Oct 24 2009 Jonathan Martens 5.2.0-8.sme +- Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501] + +* Tue Oct 20 2009 Filippo Carletti 5.2.0-7.sme +- Clean up: remove unused nonetworkdrivers [SME: 5521] + +* Sat Jun 6 2009 Shad L. Lords 5.2.0-6.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5336] + +* Mon May 18 2009 Gavin Weight 5.2.0-5.sme +- Allow for different mdadm output formats for DeviceSize. [SME: 5230] + +* Sat Feb 14 2009 Jonathan Martens 5.2.0-4.sme +- Auto-mount USB REV70-drive as usbdisk [SME: 5006] + +* Sat Oct 25 2008 Stephen Noble 5.2.0-3.sme +- create service link for smartd [SME: 1445] + +* Mon Oct 13 2008 Shad L. Lords 5.2.0-2.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Tue Oct 7 2008 Shad L. Lords 5.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Sep 23 2008 Stephen Noble 4.19.0-6 +- Add locale tags for email in review panel [SME: 4267] + +* Sat Sep 20 2008 Shad L. Lords 4.19.0-5 +- Correct gettext type during build process [SME: 570] + +* Mon Sep 15 2008 Shad L. Lords 4.19.0-4 +- Fix screen corruption in console [SME: 4155] + +* Sat Sep 13 2008 Shad L. Lords 4.19.0-3 +- Fix detection of xen instance against newer kernels [SME: 4555] + +* Thu Aug 28 2008 Jonathan Martens 4.19.0-2 +- Fixed warnings generated during build process [SME: 570] + +* Wed Aug 20 2008 Shad L. Lords 4.19.0-1 +- Roll new dev stream. + +* Sun Aug 17 2008 Gavin Weight 4.18.1-22 +- Add gettext to creating backup file title for localization. [SME: 4467] + +* Mon Aug 11 2008 Charlie Brady 4.18.1-21 +- Fix race condition in VPN ip-down handling which could cause loss of + LAN connectivity. [SME: 4405] + +* Sat Aug 9 2008 Shad L. Lords 4.18.1-20 +- Remove requires for whiptail. No longer needed [SME: 4491] + +* Fri Aug 8 2008 Jonathan Martens 4.18.1-19 +- Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487] + +* Thu Aug 7 2008 Jonathan Martens 4.18.1-18 +- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it + to e-smith-formmagick's general [SME: 4475] +- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476] +- Remove invalid entry tag from userpassword's locale file preventing the + form from displaying properly [SME: 4479] + +* Tue Aug 5 2008 Jonathan Martens 4.18.1-17 +- Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472] + +* Mon Aug 4 2008 Jonathan Martens 4.18.1-16 +- Revert some locale changes + +* Tue Jul 22 2008 Gavin Weight 4.18.1-15 +- Add regex to support cciss device names in manageRAID.pl. [SME: 4455] + +* Sat Jul 5 2008 Jonathan Martens 4.18.1-14 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Sun Apr 27 2008 Jonathan Martens 4.18.1-13 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Wed Apr 23 2008 Shad L. Lords 4.18.1-12 +- Fix for > 5 nics detected [SME: 4232] + +* Tue Apr 22 2008 Shad L. Lords 4.18.1-11 +- Remove use of Date::Manip from ssl.crt [SME: 3155] + +* Sat Apr 19 2008 Shad L. Lords 4.18.1-10 +- Fix FreeBusy param when disabled [SME: 1806] +- Remove .orig file [SME: 4228] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-9 +- Remove quitConsole from menu [SME: 4154] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-8 +- Really fix free/busy in usermanager [SME: 4157] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-7 +- Use frames in elinks [SME: 4156] +- Set homepage for elinks [SME: 4160] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-6 +- Fix free/busy field in useraccounts [SME: 4157] + +* Tue Apr 1 2008 Shad L. Lords 4.18.1-5 +- Add free/busy URL entry to help kronolith contribs [SME: 1806] + +* Fri Mar 28 2008 Shad L. Lords 4.18.1-4 +- Fix insert_mode for elinks on el5 platform [SME: 4127] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-3 +- Set accounts to deleted before template expansion [SME: 4122] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-2 +- Fix gettext strings returned by password checks [SME: 4104] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-1 +- Roll new stable stream consolidating patches. + +* Mon Mar 24 2008 Shad L. Lords 4.18.0-104 +- Finish removing pleasewait [SME: 126] + +* Tue Mar 18 2008 Shad L. Lords 4.18.0-103 +- Add gettext to console titles. [SME: 4089] + +* Sat Mar 15 2008 Stephen Noble 4.18.0-102 +- Minor translation fixes [SME: 4058] [SME: 4059] + +* Wed Mar 12 2008 Shad L. Lords 4.18.0-101 +- Remove tests for removed FORM_TITLE's [SME: 4050] + +* Wed Mar 12 2008 Shad L. Lords 4.18.0-100 +- Cleanup SAVE/ADD tag mixup [SME: 4045] + +* Sat Mar 10 2008 Shad L. Lords 4.18-99 +- Fix dyndns custom gettext [SME: 4032] + +* Sat Mar 07 2008 Stephen Noble 4.18-98 +- revised gettext messages [SME: 631] + +* Sat Mar 07 2008 Stephen Noble 4.18-97 +- gettext messages [SME: 631] + +* Sat Mar 07 2008 Stephen Noble 4.18-96 +- remove duplicate system password has been changed [SME: 3974] + +* Sat Mar 07 2008 Stephen Noble 4.18-95 +- EthernetAssign shouldn't be translated [SME: 3947] + +* Sun Feb 17 2008 Stephen Noble 4.18-94 +- Remove pleasewait function [SME: 126] + +* Sun Feb 17 2008 Stephen Noble 4.18-93 +- fix gettext formatting in three files [SME: 3938] + +* Wed Feb 13 2008 chris burnat 4.18-92 +- Fix creation of usernames and pseudonyms with one character +- [SME: 2451] + +* Wed Feb 13 2008 Stephen Noble 4.18-91 +- Remove tags now in general [SME: 3911] + +* Sun Feb 10 2008 Stephen Noble 4.18-90 +- Remove duplicate entries [SME: 3894] + +* Sat Feb 09 2008 Stephen Noble 4.18-89 +- remove unused ROUTER_DESC token from lexicon [SME: 3879] + +* Sat Jan 12 2008 Shad L. Lords 4.18-88 +- remove default of 1400 MTU for interfaces [SME: 549] + +* Wed Jan 09 2008 Stephen Noble 4.18-87 +- db prop to dissociate admin password from root in useraccounts.pm [SME: 3117] + +* Wed Jan 09 2008 Stephen Noble 4.18-86 +- pptp connections setting mtu/mru > 1400 [SME: 549] + +* Tue Jan 08 2008 Stephen Noble 4.18-85 +- console to strength validate password choice on first entry [SME: 3131] + +* Tue Jan 08 2008 Stephen Noble 4.18-84 +- Auto-mount USB REV-drive as usbdisk [SME: 2972] + +* Sun Jan 06 2008 Stephen Noble 4.18-83 +- ignore error returns from tar [SME: 3127] + +* Sun Jan 06 2008 Stephen Noble 4.18-82 +- Use esmith::util::validatePassword on console [SME: 2173] + +* Mon Dec 24 2007 Gavin Weight 4.18.0-81 +- Link smartd.conf to bootstrap-save-console and console-save. [SME: 1445] + +* Mon Dec 24 2007 Stephen Noble 4.18-80 +- Add smartd as a disabled service with template [SME: 1445] + +* Sun Dec 16 2007 Shad L. Lords 4.18.0-79 +- Lock user accounts with usermod instead of passwd [SME: 3595] + +* Sun Dec 16 2007 Gavin Weight 4.18.0-78 +- Add symlink to fr-fr locale. [SME: 3648] + +* Mon Nov 12 2007 Shad L. Lords 4.18.0-77 +- Add fix for varying partition sizes in add_raid [SME: 3547] + +* Sun Nov 11 2007 Gavin Weight 4.18.0-76 +- Fix removal of Corporate DNS from console. [SME: 3532] + +* Fri Nov 02 2007 Gavin Weight 4.18.0-75 +- Remove previous change, applied to wrong package. [SME: 3512] + +* Fri Nov 02 2007 Gavin Weight 4.18.0-74 +- Add WPAD feature for DHCP (Thanks Hector Perez). [SME: 3512] + +* Tue Oct 16 2007 Gavin Weight 4.18.0-73 +- Make non-Removable pseudonyms point to admin when reassigned. [SME: 2214] + +* Sun Oct 14 2007 Gavin Weight 4.18.0-72 +- Adjust success text when changing admin password. [SME: 2442] + +* Thu Oct 11 2007 Charlie Brady 4.18.0-71 +- Fix comparison of expected to actual SSL cert data. Also change + truncation point for email address from 40 chars to 64. [SME: 1736]. + [Note that -70 was inadvertently skipped.] + +* Tue Sep 11 2007 Gavin Weight 4.18.0-69 +- Move httpd logrotate.d directory to e-smith-apache. [SME: 3380] + +* Tue Sep 11 2007 Gavin Weight 4.18.0-68 +- Rename in logrotate.d directory apache to httpd. [SME: 3380] + +* Fri Sep 07 2007 Charlie Brady 4.18.0-67 +- Fix pod in groups.pm file. [SME: 3379] + +* Wed Aug 22 2007 Charlie Brady 4.18.0-66 +- Relax restrictions on restore devices, to allow CDR and DVDR. + [SME: 3126] + +* Fri Aug 03 2007 Charlie Brady 4.18.0-65 +- Ensure that depmod is run for all installed kernels. [SME: 3235] + +* Wed Jul 04 2007 Charlie Brady 4.18.0-64 +- Really really clear devices variable [SME: 3116] + +* Sun Jul 1 2007 Shad L. Lords 4.18.0-63 - Really clear devices variable [SME: 3116] * Sun Jul 1 2007 Shad L. Lords 4.18.0-62 @@ -1139,29 +1441,6 @@ e-smith server and gateway software - ba %patch28 -p1 %patch29 -p1 %patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 - -rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin -rm -rf root/etc/e-smith/templates/etc/identd.masq %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1207,7 +1486,7 @@ echo "disabled" > root/etc/e-smith/db/c %endif LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ - -type f | grep -v CVS | grep -v pleasewait) + -type f | grep -v CVS) for lexicon in $LEXICONS do @@ -1226,11 +1505,12 @@ ln -s /etc/rc.d/rc7.d root/etc/rc7.d mkdir -p root/etc/rc.d/rc1.d mkdir -p root/usr/share/locale/en_US/LC_MESSAGES -xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console +xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades -# ln -s fr root/etc/e-smith/locale/fr-ca +# ln -s fr root/etc/e-smith/locale/fr-ca +ln -s fr root/etc/e-smith/locale/fr-fr ln -s en-us root/etc/e-smith/locale/en ln -s en-us root/etc/e-smith/locale/en-au ln -s en-us root/etc/e-smith/locale/en-gb @@ -1240,6 +1520,9 @@ mkdir -p root/etc/e-smith/templates/etc/ ln -s /etc/e-smith/templates-default/template-begin-shell \ root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin +mkdir -p root/etc/e-smith/templates/etc/ldap.secret/ +touch root/etc/e-smith/templates/etc/ldap.secret/template-begin + for file in imap login passwd pwauth system-auth do mkdir -p root/etc/e-smith/templates/etc/pam.d/$file @@ -1270,7 +1553,6 @@ rm root/service/{syslog,klogd} mkdir -p root/etc/e-smith/events/local mkdir -p root/etc/e-smith/events/user-modify-admin mkdir -p root/home/e-smith/db -touch root/home/e-smith/db/configuration mkdir -p root/etc/e-smith/pam mkdir -p root/home/e-smith/ssl.key @@ -1282,8 +1564,6 @@ mkdir -p root/var/state/e-smith for file in %{dbfiles} do mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force} - # Create ghost file for rpm - touch root/home/e-smith/db/$file done mkdir -p root/etc/tcprules