Skip to content

Commit e042ffa

Browse files
committed
Revert "[Tink] initramfs boot to console with tmpfs root (open-edge-platform#77)"
This reverts commit 4ac7228.
1 parent 31a4c14 commit e042ffa

File tree

8 files changed

+5
-245
lines changed

8 files changed

+5
-245
lines changed

SPECS/dracut/90tmpfsroot/tmpfsroot-module-setup.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

SPECS/dracut/dracut.signatures.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
"dracut-102.tar.gz": "601b175cbf4d2ee902bb7bda3af8826ae2ca060c1af880f6da5a833413f4ec70",
1313
"lgpl-2.1.txt": "dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551",
1414
"megaraid.conf": "914824cdbe0c525b71efa05a75e453335b0068beb8bc28bef2a5866d74bf7dd4",
15-
"tmpfsroot-module-setup.sh": "d1e2d512a3769fb70f7726b1899f89950d5bfc2199e8cde5df44adebd740006f",
16-
"tmpfsroot-mount.sh": "884c4c9a17118229dfbb40ec9a4a23d307c12349dbf19adc1a2d8640c2f77fd0",
1715
"module-setup.sh": "8f5a0d3cc393d78bcb523b0d53c578d2767d688f00e84b525355bbb31d753da4",
1816
"overlayfs-mount.sh": "28f47c107a4435c5153bdb5b2f92f20b7a75bf3932216635ee810875c27dd55b"
1917
}
20-
}
18+
}

SPECS/dracut/dracut.spec

Lines changed: 1 addition & 22 deletions
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: 13%{?dist}
7+
Release: 12%{?dist}
88
# The entire source code is GPLv2+
99
# except install/* which is LGPLv2+
1010
License: GPLv2+ AND LGPLv2+
@@ -31,8 +31,6 @@ Source11: 50-noxattr.conf
3131
Source12: 90livenet/azl-liveos-artifacts-download.service
3232
Source13: 90livenet/azl-liveos-artifacts-download.sh
3333
Source14: 90overlayfs/azl-configure-selinux.sh
34-
Source15: 90tmpfsroot/tmpfsroot-module-setup.sh
35-
Source16: 90tmpfsroot/tmpfsroot-mount.sh
3634

3735
# allow-liveos-overlay-no-user-confirmation-prompt.patch has been introduced by
3836
# the Azure Linux team to allow skipping the user confirmation prompt during
@@ -158,13 +156,6 @@ Requires: %{name} = %{version}-%{release}
158156
%description systemd-cryptsetup
159157
This package contains dracut module needed to build an initramfs with systemd-cryptsetup enabled.
160158

161-
%package tmpfsroot
162-
Summary: dracut module to support root on tmpfs
163-
Requires: %{name} = %{version}-%{release}
164-
165-
%description tmpfsroot
166-
This package contains dracut module root on tmpfs.
167-
168159
%package virtio
169160
Summary: dracut configuration needed to build an initramfs with virtio guest drivers
170161
Requires: %{name} = %{version}-%{release}
@@ -240,10 +231,6 @@ mkdir -p %{buildroot}%{dracutlibdir}/modules.d/20overlayfs/
240231
install -p -m 0755 %{SOURCE4} %{buildroot}%{dracutlibdir}/modules.d/20overlayfs/
241232
install -p -m 0755 %{SOURCE5} %{buildroot}%{dracutlibdir}/modules.d/20overlayfs/
242233

243-
mkdir -p %{buildroot}%{dracutlibdir}/modules.d/90tmpfsroot/
244-
install -p -m 0755 %{SOURCE15} %{buildroot}%{dracutlibdir}/modules.d/90tmpfsroot/module-setup.sh
245-
install -p -m 0755 %{SOURCE16} %{buildroot}%{dracutlibdir}/modules.d/90tmpfsroot/
246-
247234
touch %{buildroot}%{_var}/opt/%{name}/log/%{name}.log
248235
ln -srv %{buildroot}%{_var}/opt/%{name}/log/%{name}.log %{buildroot}%{_var}/log/
249236

@@ -264,7 +251,6 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
264251
%exclude %{_libdir}/kernel
265252
%exclude %{dracutlibdir}/modules.d/20overlayfs
266253
%exclude %{dracutlibdir}/modules.d/90systemd-cryptsetup
267-
%exclude %{dracutlibdir}/modules.d/90tmpfsroot
268254
%{_libdir}/%{name}/%{name}-init.sh
269255
%{_datadir}/pkgconfig/%{name}.pc
270256
%{dracutlibdir}/%{name}-functions.sh
@@ -333,10 +319,6 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
333319
%dir %{dracutlibdir}/modules.d/90systemd-cryptsetup
334320
%{dracutlibdir}/modules.d/90systemd-cryptsetup/*
335321

336-
%files tmpfsroot
337-
%dir %{dracutlibdir}/modules.d/90tmpfsroot
338-
%{dracutlibdir}/modules.d/90tmpfsroot/*
339-
340322
%files virtio
341323
%defattr(-,root,root,0755)
342324
%{_sysconfdir}/dracut.conf.d/00-virtio.conf
@@ -355,9 +337,6 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
355337
%dir %{_sharedstatedir}/%{name}/overlay
356338

357339
%changelog
358-
* Fri May 16 2025 Swee Yee Fonn <swee.yee.fonn@intel.com> - 102-13
359-
- Add tmpfsroot dracut module
360-
361340
* Thu Apr 28 2025 Ranjan Dutta <ranjan.dutta@intel.com> - 102-12
362341
- merge from Azure Linux tag 3.0.20250423-3.0
363342
- Add fix for systemd-cryptsetup module to be included in initramfs when needed

toolkit/imageconfigs/edge-image-tink.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Artifacts": [
77
{
88
"Name": "edge-readonly-tink",
9-
"Type": "tar.gz"
9+
"Compression": "tar.gz"
1010
}
1111
]
1212
}
@@ -37,17 +37,13 @@
3737
"FinalizeImageScripts": [
3838
{
3939
"Path": "scripts/cleanup.sh"
40-
},
41-
{
42-
"Path": "scripts/setup-tink-image.sh"
4340
}
4441
],
4542
"KernelCommandLine": {
46-
"ExtraCommandLine": "root=tmpfs rootflags=size=1G,mode=0755 rd.skipfsck noresume quiet splash"
43+
"ExtraCommandLine": "quiet splash"
4744
},
48-
"Hostname": "EMT-tink",
45+
"Hostname": "EdgeMicrovisorToolkitTink",
4946
"DisableRpmDocs": true,
50-
"RemoveRpmDb": true,
5147
"Users": [
5248
{
5349
"Name": "root",

toolkit/imageconfigs/packagelists/tink-packages.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"packages": [
3-
"dracut-tmpfsroot",
4-
"tar",
53
"fluent-bit",
64
"caddy",
75
"rng-tools",

toolkit/imageconfigs/scripts/generate-tink-initramfs.sh

Lines changed: 0 additions & 104 deletions
This file was deleted.

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

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)