Skip to content

Commit

Permalink
[TOSS-28] REALLY remove size from fstab shm
Browse files Browse the repository at this point in the history
Remove /usr/share/nfsroot/initial-fstab from the package.  It is unused.
Fix the size= option on /dev/shm where it matters, which is in
rc.nfsroot-init (which generates the initial fstab).
  • Loading branch information
garlick committed Aug 21, 2014
1 parent 2d9c29f commit 187b307
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 15 deletions.
6 changes: 1 addition & 5 deletions etc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ sysconfigdir = $(sysconfdir)/sysconfig

sysconfig_SCRIPTS = nfsroot

pkglibdir = @X_DATADIR@/@PACKAGE@

pkglib_DATA = initial-fstab

EXTRA_DIST = nfsroot initial-fstab
EXTRA_DIST = nfsroot
5 changes: 0 additions & 5 deletions etc/initial-fstab

This file was deleted.

4 changes: 0 additions & 4 deletions nfsroot.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ install -m 644 %{_datadir}/syslinux/pxelinux.0 %{bootdir}/
install -m 644 %{_datadir}/syslinux/memdisk %{bootdir}/
mkdir -p -m 755 /writeable
%{_sbindir}/nfsroot-rebuild
if ! [ -e %{_sysconfdir}/fstab ]; then
install -m 644 %{_datadir}/nfsroot/initial-fstab %{_sysconfdir}/fstab
fi

%files
%defattr(-,root,root)
Expand All @@ -61,7 +58,6 @@ fi
%{_datadir}/dracut/modules.d/*
%{_sysconfdir}/kernel/postinst.d/*
%{_sysconfdir}/kernel/prerm.d/*
%{_datadir}/nfsroot

%changelog
* Mon Jun 19 2006 Jim Garlick <garlick@llnl.gov>
Expand Down
2 changes: 1 addition & 1 deletion rc/rc.nfsroot-init
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if ! [ -e /etc/fstab ]; then
root / root defaults 0 0
none /dev/pts devpts gid=5,mode=620 0 0
none /proc proc defaults 0 0
tmpfs /dev/shm tmpfs defaults,size=100K 0 0
tmpfs /dev/shm tmpfs defaults 0 0
tmpfs /tmp tmpfs defaults 0 0
EOTFSTAB
fi
Expand Down

0 comments on commit 187b307

Please sign in to comment.