Skip to content

Commit 77e252f

Browse files
authored
[TINK] Modify tmpfsroot mount for tink image (#173)
Remove limit of 1G of tmpfs, it will by default take take up 50% of RAM Remove specifying size as 1G when mounting /tmpfs Also remove create /etc/fstab file and remove rootflags to limit tmpfs to 1G Signed-off-by: Lishan Liu <lishan.liu@intel.com>
1 parent a577531 commit 77e252f

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

SPECS/dracut/90tmpfsroot/tmpfsroot-mount.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License.
44

55
info "mount tmpfs for root"
6-
if ! mount -t tmpfs -o size=1G tmpfs $NEWROOT; then
6+
if ! mount -t tmpfs tmpfs $NEWROOT; then
77
warn "Failed to mount tmpfs on $NEWROOT"
88
die
99
fi

SPECS/dracut/dracut.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"lgpl-2.1.txt": "dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551",
1414
"megaraid.conf": "914824cdbe0c525b71efa05a75e453335b0068beb8bc28bef2a5866d74bf7dd4",
1515
"tmpfsroot-module-setup.sh": "d1e2d512a3769fb70f7726b1899f89950d5bfc2199e8cde5df44adebd740006f",
16-
"tmpfsroot-mount.sh": "884c4c9a17118229dfbb40ec9a4a23d307c12349dbf19adc1a2d8640c2f77fd0",
16+
"tmpfsroot-mount.sh": "5fdcac59d2a9560215f91619373fb217592e7c9e51ff74cd21883411ea6ded66",
1717
"module-setup.sh": "8f5a0d3cc393d78bcb523b0d53c578d2767d688f00e84b525355bbb31d753da4",
1818
"overlayfs-mount.sh": "28f47c107a4435c5153bdb5b2f92f20b7a75bf3932216635ee810875c27dd55b"
1919
}

SPECS/dracut/dracut.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: dracut to create initramfs
55
Name: dracut
66
Version: 102
7-
Release: 14%{?dist}
7+
Release: 15%{?dist}
88
# The entire source code is GPLv2+
99
# except install/* which is LGPLv2+
1010
License: GPLv2+ AND LGPLv2+
@@ -345,6 +345,9 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
345345
%dir %{_sharedstatedir}/%{name}/overlay
346346

347347
%changelog
348+
* Fri May 30 2025 Lishan Liu <lishan.liu@intel.com> - 102-15
349+
- Update tmpfs mount command in tmpfsroot-mount.sh
350+
348351
* Thu May 22 2025 Mun Chun Yep <mun.chun.yep@intel.com> - 102-14
349352
- Revert 6d93d4260 to fix tmpfs mount issue.
350353

toolkit/imageconfigs/edge-image-tink.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
}
4444
],
4545
"KernelCommandLine": {
46-
"ExtraCommandLine": "root=tmpfs rootflags=size=1G,mode=0755 rd.skipfsck noresume quiet splash modules-load=nbd"
46+
"ExtraCommandLine": "root=tmpfs rootflags=mode=0755 rd.skipfsck noresume quiet splash modules-load=nbd"
4747
},
4848
"Hostname": "EMT-tink",
4949
"DisableRpmDocs": true,

toolkit/imageconfigs/scripts/setup-tink-image.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ mkdir -p /etc/fluent-bit
1616
if [ ! -f /etc/fluent-bit/fluent-bit.conf ]; then
1717
touch /etc/fluent-bit/fluent-bit.conf
1818
fi
19-
echo "$pprefix: fstab contents $(cat /etc/fstab)"
20-
echo 'tmpfs / tmpfs defaults,size=1G 0 0' > /etc/fstab
2119
echo "$pprefix: $(du -ah /usr/share)"
2220
find /usr/share -type f \
2321
! -path "/usr/share/terminfo/v/vt100" \

0 commit comments

Comments
 (0)