1
0
mirror of https://github.com/systemd/systemd synced 2025-09-29 08:44:45 +02:00

Compare commits

...

17 Commits

Author SHA1 Message Date
Luca Boccassi
e418ba4074 meson: update version numbers for v258~rc4 2025-09-05 11:34:36 +01:00
Luca Boccassi
edf214d186 NEWS: update date 2025-09-05 11:34:07 +01:00
Luca Boccassi
67b10eb76b NEWS: note sd-stub incompatibility with older ukify 2025-09-05 11:33:51 +01:00
Luca Boccassi
28edbbdc1b test: add more debug output
The test occasionally fails with:

TEST-50-DISSECT.sh[3852]: Hierarchy '/usr' is already merged.

I can't really tell what is already merged as all previous ops
look as they are undone from the logs, so add status/list commands
just before the failing operation to hopefully give more info

For https://github.com/systemd/systemd/issues/38282
2025-09-05 12:13:25 +02:00
Daan De Meyer
aa4b1a97dc
Update hwdb and contributor list for v258-rc4 (#38828) 2025-09-05 11:19:31 +02:00
Zbigniew Jędrzejewski-Szmek
711b5e805d Revert "terminal-util: explicitly reset cursor"
This reverts commit b177095bfac9d04871762cff4febfca43e790529.

The original issue (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=375275,
https://github.com/systemd/systemd/issues/22168) was about having a block
cursor instead of a box cursor after VM reset, which doesn't seem particularly
urgent. OTOH, the patch causes a minor regression, where the splash screen is
cleared immediately and replaced by a blinking cursor. With the patch, we are
trading one visual issue for another visual issue. The second is probably more
noticeable, since some poeple put in quite a lot of work to have pretty boots
where the firmware splash screen is displayed until the login prompt pops up.
Avoiding a regression is more important than fixing a minor long-standing
issue, so let's revert this.

Fixes https://github.com/systemd/systemd/issues/38752.
2025-09-05 11:18:51 +02:00
Luca Boccassi
7b53fd6215
Clean up redirection ops in tests (#38827) 2025-09-05 09:41:53 +01:00
Zbigniew Jędrzejewski-Szmek
311cc3c78e NEWS: update contributor list 2025-09-05 09:18:19 +02:00
Zbigniew Jędrzejewski-Szmek
438ab26379 hwdb: run "update-hwdb"
As usual, just additions and corrections.
2025-09-05 09:18:06 +02:00
Daan De Meyer
f743084035
nspawn: Drop CAP_NET_BIND_SERVICE if in userns with identity mapping (#38723)
Even if there's no uid shift, we still won't be able to bind to
privileged ports in the host network namespace, so drop the capability
regardless of whether we have a uid shift or not.
2025-09-05 09:08:44 +02:00
Zbigniew Jędrzejewski-Szmek
e1485c0546 tests: drop pointless redirection of stderr from 'command -v'
The whole point of using 'command -v' is that it's a very portable
way to check if an executable exists. It doesn't print an error.
2025-09-05 08:29:52 +02:00
Zbigniew Jędrzejewski-Szmek
51fac9a0bf TEST-75-RESOLVED: drop whitespace after shell redirection ops 2025-09-05 08:29:52 +02:00
Daan De Meyer
cadeaef67c test: Add test for nspawn's handling of cap_net_bind_service 2025-09-05 08:24:39 +02:00
DaanDeMeyer
945e1fd37b nspawn: Drop CAP_NET_BIND_SERVICE if in userns with identity mapping
Even if there's no uid shift, we still won't be able to bind to privileged
ports in the host network namespace, so drop the capability regardless of
whether we have a uid shift or not.
2025-09-05 08:24:39 +02:00
Daan De Meyer
f70754b34f TEST-13-NSPAWN: Fix typo 2025-09-05 08:24:39 +02:00
Daan De Meyer
b21f52b6d1 mkosi: Install libcap-progs in main and minimal image
Let's make sure tools like capsh are available on OpenSUSE images
as well.
2025-09-05 08:24:39 +02:00
Daan De Meyer
a8211e88c7 gpt-auto-generator: Pass verity settings to dissect_loop_device()
The image policy might be configured to enforce verity protection on the
root or usr partitions. Currently, we get around that by ignoring the root
and usr partitions, given that by the time this code runs in the rootfs these
will have already been mounted.

However, we can't actually ignore the root partition, as we will enable
growfs and/or remounting the root partition rw based on the root partition
we find in the image.

Instead, let's just read any roothash= or usrhash= from the kernel command line
and pass in a populated verity settings struct into dissect_loop_device()
instead of NULL. If NULL is passed, any verity partitions in the image are
ignored. If we pass the default verity settings, the wrong verity partitions might
potentially be picked up, so we make sure to pass a fully populated instance. This
should be sufficient to satisfy any configured image policy verity protection checks.

Reverts 6d6538fb3f46b01dded23cc7eef5ed5ffe8b38e9

Fixes #38788
2025-09-05 07:48:15 +02:00
19 changed files with 2766 additions and 1480 deletions

128
NEWS
View File

@ -166,6 +166,12 @@ CHANGES WITH 258 in spe:
To control the mode, please use the quotacheck.mode= kernel command
line option of newly introduced quotacheck.mode credential.
* systemd-stub v258 requires ukify v257.9 or v258 or newer when
building a UKI. Due to an incompatible change necessary in order to
fix a bug related to embedding a .sbat section larger than 512 bytes,
ukify v257.8 or older will not be able to use systemd-stub v258 or
newer.
Announcements of Future Feature Removals:
* Support for System V service scripts is deprecated and will be
@ -1524,71 +1530,69 @@ CHANGES WITH 258 in spe:
Alexander Krabler, Alexander Kurtz, Alexander Shopov,
Alexander Stepchenko, Allison Karlitskaya, Aman Verma,
Américo Monteiro, Andika Triwidada, AndreFerreiraMsc,
Andreas Henriksson, Andreas Schneider, Andreas Stührk,
Andres Beltran, Andrew Sayers, Andrii Chubatiuk, André Monteiro,
Andy Shevchenko, Ani Sinha, Anthony Avina, Anthony Messina,
Anton Ryzhov, Antonio Alvarez Feijoo, Arian van Putten,
Arkadiusz Bokowy, Arnaudv6, AsciiWolf, Avram Dorfman,
Bastien Nocera, Beniamino Galvani, Brett Holman, Busayo Dada,
ButterflyOfFire, Carlo Teubner, Chris Grant, Chris Hofstaedtler,
Chris Mayo, Christian Glombek, Christian Hesse, Colin Foster,
Cosima Neidahl, Craig McLure, Daan De Meyer, DaanDeMeyer,
Dai MIKURUBE, Dan McGregor, Dan Streetman, Daniel Foster,
Daniel Rusek, Daniil, David C. Manuelda, David Härdeman,
Andreas Henriksson, Andreas Schneider, Andreas Stührk, Andres Beltran,
Andrew Sayers, Andrii Chubatiuk, André Monteiro, Andy Shevchenko,
Ani Sinha, Anthony Avina, Anthony Messina, Anton Ryzhov,
Antonio Alvarez Feijoo, Arian van Putten, Arkadiusz Bokowy, Arnaudv6,
AsciiWolf, Avram Dorfman, Bastien Nocera, Beniamino Galvani,
Brett Holman, Busayo Dada, ButterflyOfFire, Carlo Teubner, Chris Grant,
Chris Hofstaedtler, Chris Mayo, Christian Glombek, Christian Hesse,
Christopher Head, Colin Foster, Cosima Neidahl, Craig McLure,
Daan De Meyer, DaanDeMeyer, Dai MIKURUBE, Dan McGregor, Dan Streetman,
Daniel Foster, Daniel Rusek, Daniil, David C. Manuelda, David Härdeman,
David Rheinsberg, David Tardon, Debarshi Ray, Deli Zhang,
Devilish Spirits, Dimitri John Ledkov, Duncan Overbruck,
Dusty Mabe, Eaterminer, Eisuke Kawashima, Emilio Sepulveda,
Emir SARI, Emmanuel Ferdman, Enrico Tagliavini, Erik Larsson,
Erin Shepherd, Ettore Atalan, Fabian Möller, Fabian Vogt,
Fco. Javier F. Serrador, Federico Giovanardi, Fleuria,
Florian Schmaus, Franck Bui, Frantisek Sumsal, Frede Braendstrup,
Gabríel Arthúr Pétursson, Gavin Li, George Tsiamasiotis,
Graham Clinch, Grimmauld, H A, Hang Li, Harrison Vanderbyl,
Hendrik Wolff, Henri Aunin, Igor Opaniuk, Itxaka, Ivan Kruglov,
Ivan Trubach, Jacob McNamee, James Hilliard, Jan Engelhardt,
Jan Kalabza, Jan Macku, Jan Vaclav, Jan Čermák, Jared Baur,
Jaroslav Škarvada, Javier Francisco, Jelle van der Waa,
Jeremy Linton, Jesper Nilsson, Jesse Guo, Jim Spentzos,
Joaquim Monteiro, Joey Holtzman, John Rinehart, Jonas Gorski,
Jordan Petridis, Jose Ortuno, Jules Lamur, Justinas Kairys,
Jörg Behrmann, Katariina Lounento, Kevin P. Fleming, Khem Raj,
KidGrimes, Kurt Borja, Lennart Poettering, Li Tian, Lin Jian,
Linus Heckemann, Lorenzo Arena, Louis Sautier, LuK1337,
Luca Boccassi, Lucas Adriano Salles, Luke Yeager, Lukáš Nykrýn,
Luna Jernberg, Léane GRASSER, Marco Trevisan (Treviño),
Marcos Alano, Mario Limonciello, Markus Kurz, Martin Hundebøll,
Martin Srebotnjak, Martin Wilck, Mate Kukri, Matteo Croce,
Matthew Schwartz, Matthias Lisin, Matthieu Baerts (NGI0),
Devilish Spirits, Dimitri John Ledkov, Duncan Overbruck, Dusty Mabe,
Eaterminer, Eisuke Kawashima, Emilio Sepulveda, Emir SARI,
Emmanuel Ferdman, Enrico Tagliavini, Erik Larsson, Erin Shepherd,
Ettore Atalan, Fabian Möller, Fabian Vogt, Fco. Javier F. Serrador,
Federico Giovanardi, Felix Pehla, Fleuria, Florian Schmaus, Franck Bui,
Frantisek Sumsal, Frede Braendstrup, Gabríel Arthúr Pétursson,
Gavin Li, George Tsiamasiotis, Graham Clinch, Grimmauld, H A, Hang Li,
Harrison Vanderbyl, Hendrik Wolff, Henri Aunin, Igor Opaniuk, Itxaka,
Ivan Kruglov, Ivan Trubach, Jack Wu, Jacob McNamee, James Hilliard,
Jan Engelhardt, Jan Fooken, Jan Kalabza, Jan Macku, Jan Vaclav,
Jan Čermák, Jared Baur, Jaroslav Škarvada, Jasmine Andrever-Wright,
Javier Francisco, Jelle van der Waa, Jeremy Linton, Jesper Nilsson,
Jesse Guo, Jim Spentzos, Joaquim Monteiro, Joey Holtzman,
John Rinehart, Jonas Gorski, Jordan Petridis, Jose Ortuno,
Josh Triplett, Jules Lamur, Justinas Kairys, Jörg Behrmann,
Kamil Páral, Katariina Lounento, Kevin P. Fleming, Khem Raj, KidGrimes,
Kurt Borja, Lennart Poettering, Li Tian, Lin Jian, Linus Heckemann,
Lorenzo Arena, Louis Sautier, LuK1337, Luca Boccassi,
Lucas Adriano Salles, Luke Yeager, Lukáš Nykrýn, Luna Jernberg,
Léane GRASSER, Marco Trevisan (Treviño), Marcos Alano,
Mario Limonciello, Markus Kurz, Martin Hundebøll, Martin Srebotnjak,
Martin Wilck, Mate Kukri, Matteo Croce, Matthew Schwartz,
Matthias Gerstner, Matthias Lisin, Matthieu Baerts (NGI0),
Matthieu LAURENT, MaxHearnden, Michael Catanzaro, Michael Ferrari,
Michael Limiero, Michael Olbrich, Michal Koutný,
Michal Sekletár, Michał Moczulski, Mike Yuan, Miroslav Lichvar,
Morten Hauke Solvang, Muhammad Nuzaihan Bin Kamal Luddin,
Myrrh Periwinkle, Nathan, NetSysFire, Nick Labich, Nick Owens,
Nick Rosbrook, Nils K, Noel Georgi, Nuno Sá, Oliver Schramm,
Paul Fertser, Pavithra Barithaya, Philip Freeman, Philip Withnall,
Piotr Drąg, Pontus Lundkvist, Ricky Tigg, RocketDev, Ronan Pigott,
Rostislav Lastochkin, Rudi Heitbaum, Ryan Blue, Ryan Thompson,
Ryan Wilson, Salim B, Salvatore Cocuzza, Sam James, Sam Leonard,
Samuel Dionne-Riel, Sea-Eun Lee, Septatrix, Shubhendra Kushwaha,
Silvio Knizek, Solar Designer, SoloSaravanan, Sonia Zorba,
Soumyadeep Ghosh, Stefan Hansson, Stefan Herbrechtsmeier,
Steve Ramage, Temuri Doghonadze, TheHillBright, Thomas Hebb,
Thorsten Kukuk, Tim Crawford, Tim Small, Tim Vangehugten,
Tobias Heider, Tobias Klauser, Todd C. Miller, Tommi Rantala,
Tommy Unger, Trollimpo, Ubuntu, Valentin David, Valentin Hăloiu,
Vasiliy Kovalev, Vishal Chillara Srinivas, Vishwanath Chandapur,
Vitaly Kuznetsov, Volodymyr Shkriabets, Vyacheslav Yurkov,
Werner Sembach, Y T, Yaping Li, Yu Watanabe, ZIHCO,
Zbigniew Jędrzejewski-Szmek, andrejpodzimek, anonymix007, cvlc12,
damnkiwi6120, davjav, fishears, hanjinpeng, haxibami, herbrechtsmeier,
honjow, hsu zangmen, igo95862, jane400, jinyaoguo, joo es,
kanitha chim, keentux, kmeaw, luc-salles, madroach, maia x.,
msizanoen, naly zzwd, nkraetzschmar, nl6720, novenary, peelz,
persmule, richfifeg, ssoss, tim tom, tuxmainy, tytan652, ver4a,
victor-ok, vlefebvre, wrvsrx, wtmpx, xinpeng wang, z z,
Дамјан Георгиевски, 铝箔
Michael Limiero, Michael Olbrich, Michal Koutný, Michal Sekletár,
Michał Moczulski, Mike Yuan, Miroslav Lichvar, Morten Hauke Solvang,
Muhammad Nuzaihan Bin Kamal Luddin, Myrrh Periwinkle, Nathan,
NetSysFire, Nick Labich, Nick Owens, Nick Rosbrook, Nils K,
Noel Georgi, Nuno Sá, Oliver Schramm, Paul Fertser, Pavithra Barithaya,
Philip Freeman, Philip Withnall, Piotr Drąg, Pontus Lundkvist,
Ricky Tigg, RocketDev, Ronan Pigott, Rostislav Lastochkin,
Rudi Heitbaum, Ryan Blue, Ryan Thompson, Ryan Wilson, Salim B,
Salvatore Cocuzza, Sam James, Sam Leonard, Samuel Dionne-Riel,
Sea-Eun Lee, Septatrix, Sergey A, Shubhendra Kushwaha, Silvio Knizek,
Solar Designer, SoloSaravanan, Sonia Zorba, Soumyadeep Ghosh,
Stefan Hansson, Stefan Herbrechtsmeier, Steve Ramage,
Temuri Doghonadze, TheHillBright, Thomas Hebb, Thorsten Kukuk,
Tim Crawford, Tim Small, Tim Vangehugten, Tobias Heider,
Tobias Klauser, Todd C. Miller, Tommi Rantala, Tommy Unger, Trollimpo,
Ubuntu, Valentin David, Valentin Hăloiu, Vasiliy Kovalev,
Vishal Chillara Srinivas, Vishwanath Chandapur, Vitaly Kuznetsov,
Volodymyr Shkriabets, Vyacheslav Yurkov, Werner Sembach, Y T,
Yaping Li, Yu Watanabe, ZIHCO, Zbigniew Jędrzejewski-Szmek,
andrejpodzimek, anonymix007, cvlc12, damnkiwi6120, davjav, fishears,
hanjinpeng, haxibami, herbrechtsmeier, honjow, hsu zangmen, igo95862,
jane400, jinyaoguo, joo es, kanitha chim, keentux, kmeaw, luc-salles,
madroach, maia x., msizanoen, naly zzwd, nkraetzschmar, nl6720,
novenary, peelz, persmule, richfifeg, ssoss, tim tom, tuxmainy,
tytan652, val4oss, ver4a, victor-ok, vlefebvre, wrvsrx, wtmpx,
xinpeng wang, z z, Дамјан Георгиевски, 铝箔, 김인수
— Edinburgh, 2025/08/20
— Edinburgh, 2025/09/05
CHANGES WITH 257:

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
--- 20-acpi-vendor.hwdb.base 2025-08-20 13:04:02.003302877 +0100
+++ 20-acpi-vendor.hwdb 2025-08-20 13:04:02.007302969 +0100
--- 20-acpi-vendor.hwdb.base 2025-09-05 09:10:01.771007528 +0200
+++ 20-acpi-vendor.hwdb 2025-09-05 09:10:01.786007236 +0200
@@ -3,6 +3,8 @@
# Data imported from:
# https://uefi.org/uefi-pnp-export

File diff suppressed because it is too large Load Diff

View File

@ -7319,12 +7319,54 @@ E0-23-3B (hex) IOFAC
Gwangmyeong-si Gyeonggi-do 14303
KR
48-08-EB (hex) Guangzhou Chuangsou Network Technology Co., Ltd.
900000-9FFFFF (base 16) Guangzhou Chuangsou Network Technology Co., Ltd.
No. 1601-1603Guangzhou Avenue South, Haizhu District,Guangzhou City,Guangzhou Venture Capital Town Technology and Fashion Industry Agglomeration Area, self compiled Building A,1st, 2nd,and 3rd floors,No.37,38,41,and 42
Guangzhou Guangdong 510000
CN
48-08-EB (hex) Silicon Dynamic Networks
D00000-DFFFFF (base 16) Silicon Dynamic Networks
Floor 2, Building 14, Section C, St. Moritz Garden, Yulong Road, Longhua New District
Shenzhen Guangdong 518131
CN
48-08-EB (hex) Aureka, Inc.
600000-6FFFFF (base 16) Aureka, Inc.
755 Page Mill Road, STE A200
Palo Alto CA 94304
US
50-FA-CB (hex) The Scotts Company
C00000-CFFFFF (base 16) The Scotts Company
14111 Scottslawn
Marysville OH 43041
US
9C-E4-50 (hex) XTX Markets Technologies Limited
C00000-CFFFFF (base 16) XTX Markets Technologies Limited
R7, 14-18 Handyside Street
London N1C 4DN
GB
9C-E4-50 (hex) ROHOTEK(shenzhen) Technology co., LTD
800000-8FFFFF (base 16) ROHOTEK(shenzhen) Technology co., LTD
Room 3-1802, Building T3, Haigu Technology Building, Luozu Community, Shiyan Street, Baoan District
Shenzhen Guangdong 518100
CN
50-FA-CB (hex) VeriFone Systems(China),Inc
800000-8FFFFF (base 16) VeriFone Systems(China),Inc
1701 of Building D,Area III of Innovation Park,No.20 of Gaoxin Avenue,Minhou County
Fuzhou Fujian 350000
CN
F4-97-9D (hex) Smart Access Designs, LLC
800000-8FFFFF (base 16) Smart Access Designs, LLC
58 Mackenzie Willow Ter
Cheshire CT 06410
US
B8-4C-87 (hex) Shenzhen Link-all Technology Co., Ltd
300000-3FFFFF (base 16) Shenzhen Link-all Technology Co., Ltd
Floor 5th, Block 9th, Sunny Industrial Zone, Xili Town, Nanshan District, Shenzhen, China
@ -14072,12 +14114,6 @@ A00000-AFFFFF (base 16) Annapurna labs
Mail box 15123 Haifa 3508409
IL
00-6A-5E (hex) Shenzhen Lightx Technology Co., Ltd
600000-6FFFFF (base 16) Shenzhen Lightx Technology Co., Ltd
RM 1006, 10/F PO YIP BLDG, 23 HING YIP ST, Kwun Tong, Kowloon, Hong Kong
Hong Kong 000
HK
00-6A-5E (hex) CYBERTEL BRIDGE
C00000-CFFFFF (base 16) CYBERTEL BRIDGE
9th floor, Hansin IT Tower, 272, Digital-ro,Guro-gu
@ -14138,6 +14174,60 @@ D00000-DFFFFF (base 16) Magosys Systems LTD
Rehovot 7638517
IL
48-08-EB (hex) Eruminc Co.,Ltd.
B00000-BFFFFF (base 16) Eruminc Co.,Ltd.
59-47, Seouldaehak-ro
Siheung-si Gyeonggi-do 15012
KR
48-08-EB (hex) Dspread Technology (Beijing) Inc.
800000-8FFFFF (base 16) Dspread Technology (Beijing) Inc.
Jingxin Building, 2045 Suite , Chaoyang District
Beijing 100027
CN
48-08-EB (hex) Shenzhen Electron Technology Co., LTD.
700000-7FFFFF (base 16) Shenzhen Electron Technology Co., LTD.
Building 2, Yingfeng Industrial Zone, Tantou Community, Songgang Street, Bao'an District
Shenzhen Guangzhou 51800
CN
50-FA-CB (hex) Huaihua Jiannan Electronic Technology Co.,Ltd.
300000-3FFFFF (base 16) Huaihua Jiannan Electronic Technology Co.,Ltd.
1 Jixiang Avenue, Jingkai district, Huaihua , Hunan Province (5th floor, building 8, luggage and leather creative industrial park)
Huaihua 418000
CN
50-FA-CB (hex) Shenzhen Hill Technology Co., LTD.
500000-5FFFFF (base 16) Shenzhen Hill Technology Co., LTD.
Room 203, No.118 Xingye 1st Road, Rentian Community, Fuhai Street, Baoan District
Shenzhen Guangdong 518103
CN
50-FA-CB (hex) Kyocera AVX Components (Timisoara) SRL
200000-2FFFFF (base 16) Kyocera AVX Components (Timisoara) SRL
CT Parc, Unit 2
Remetea Mare Timis 307350
RO
50-FA-CB (hex) Advant sp. z o.o.
E00000-EFFFFF (base 16) Advant sp. z o.o.
Obrońców Wybrzeża 9/4
Gdańsk pomorskie 80-398
PL
9C-E4-50 (hex) Shenzhen GW Technology Co., LTD
600000-6FFFFF (base 16) Shenzhen GW Technology Co., LTD
2-1501C, Building T2, Haigu Technology Building, Luozu Community, Shiyan Street, Bao'an District, Shenzhen City, Guangdong Province
Shenzhen Guangdong 518101
CN
9C-E4-50 (hex) AIO SYSTEMS
100000-1FFFFF (base 16) AIO SYSTEMS
158 Jan smuts drive,Walter streetRosebank quarter
Johannesburg 2196
ZA
B8-4C-87 (hex) Altronix , Corp
A00000-AFFFFF (base 16) Altronix , Corp
140 58th St. Bldg A, Ste 2N
@ -21419,12 +21509,6 @@ B00000-BFFFFF (base 16) Continental Brasil Indústria Automotiva Ltda.
Guarulhos São Paulo 07042-020
BR
F4-97-9D (hex) Shanghai Kanghai Infomation System CO.,LTD
800000-8FFFFF (base 16) Shanghai Kanghai Infomation System CO.,LTD
Room 207, Building 1, 6055 Songze Avenue , Qingpu District, Shanghai
Shanghai 201706
CN
F4-97-9D (hex) LUXSHARE - ICT(NGHE AN) LIMITED
700000-7FFFFF (base 16) LUXSHARE - ICT(NGHE AN) LIMITED
No. 18, Road No. 03, VSIP Nghe An Industrial Park, Hung Nguyen Commune, Nghe An Province, Vietnam
@ -21449,6 +21533,24 @@ F4-97-9D (hex) MERRY ELECTRONICS CO., LTD.
TAICHUNG 408213
TW
48-08-EB (hex) Tianjin Jinmu Intelligent Control Technology Co., Ltd
100000-1FFFFF (base 16) Tianjin Jinmu Intelligent Control Technology Co., Ltd
Room 3271, Building 1, Collaborative Development Center, West Ring North Road, Beijing-Tianjin Zhongguancun Science Park, BaoDi District, Tianjin, China.
Tianjin 301800
CN
48-08-EB (hex) Yeacode (Xiamen) Inkjet Inc.
A00000-AFFFFF (base 16) Yeacode (Xiamen) Inkjet Inc.
2F, No.8826, Lianting Road, Xiang An District
Xiamen FUJIAN 361100
CN
48-08-EB (hex) Quanta Storage Inc.
400000-4FFFFF (base 16) Quanta Storage Inc.
3F. No.188, Wenhua 2nd Rd
Taoyuan City Guishan District 33383
TW
E0-23-3B (hex) Rehear Audiology Company LTD.
700000-7FFFFF (base 16) Rehear Audiology Company LTD.
2F., No.57, Xingzhong Rd., Neihu Dist.,
@ -21461,16 +21563,22 @@ E0-23-3B (hex) PluralFusion INC
Richmond VA 23223
US
48-08-EB (hex) Quanta Storage Inc.
400000-4FFFFF (base 16) Quanta Storage Inc.
3F. No.188, Wenhua 2nd Rd
Taoyuan City Guishan District 33383
TW
48-08-EB (hex) Technological Application And Production One Member Liability Company (Tecapro Company)
300000-3FFFFF (base 16) Technological Application And Production One Member Liability Company (Tecapro Company)
18A Cong Hoa Street, Ward Bay Hien
Hochiminh Hochiminh 70000
VN
48-08-EB (hex) Tianjin Jinmu Intelligent Control Technology Co., Ltd
100000-1FFFFF (base 16) Tianjin Jinmu Intelligent Control Technology Co., Ltd
Room 3271, Building 1, Collaborative Development Center, West Ring North Road, Beijing-Tianjin Zhongguancun Science Park, BaoDi District, Tianjin, China.
Tianjin 301800
50-FA-CB (hex) Darveen Technology Limited
400000-4FFFFF (base 16) Darveen Technology Limited
3/F, 2nd Building Hui Sheng Da industrial park, Qingcui road, Longhua district, Shenzhen
Shenzhen Guangdong 518000
CN
50-FA-CB (hex) Shenzhen Evertones Quantum Technology Co., Ltd.
100000-1FFFFF (base 16) Shenzhen Evertones Quantum Technology Co., Ltd.
Room 3907, Tower B, Digital Innovation Center, Beizhan Community, Minzhi Sub-district, Longhua District
Shenzhen Guangdong 518131
CN
D0-14-11 (hex) P.B. Elettronica srl
@ -22304,12 +22412,6 @@ E00000-EFFFFF (base 16) ACCO Brands USA LLC
SuZhou JiangSu 215000
CN
0C-7F-ED (hex) Tango Networks Inc
200000-2FFFFF (base 16) Tango Networks Inc
2801 Network Blvd, Suite 200
Frisco TX TX 75034
US
8C-51-09 (hex) SpotterRF LLC
C00000-CFFFFF (base 16) SpotterRF LLC
720 Timpanogos Parkway
@ -28508,11 +28610,11 @@ E0-23-3B (hex) 356 Productions
LEHI UT 84043
US
E0-23-3B (hex) Elvys s.r.o
100000-1FFFFF (base 16) Elvys s.r.o
Polska 9
Kosice 04011
SK
E0-23-3B (hex) Chengdu ChengFeng Technology co,. Ltd.
C00000-CFFFFF (base 16) Chengdu ChengFeng Technology co,. Ltd.
High-tech Zone TianfuSoftwarePark,B6-103,CHENGDU, 610000
CHENGDU SICHUAN 610000
CN
E0-23-3B (hex) Kiwimoore(Shanghai) Semiconductor Co.,Ltd
600000-6FFFFF (base 16) Kiwimoore(Shanghai) Semiconductor Co.,Ltd
@ -28520,11 +28622,53 @@ E0-23-3B (hex) Kiwimoore(Shanghai) Semiconductor Co.,Ltd
Shanghai 201210
CN
E0-23-3B (hex) Chengdu ChengFeng Technology co,. Ltd.
C00000-CFFFFF (base 16) Chengdu ChengFeng Technology co,. Ltd.
High-tech Zone TianfuSoftwarePark,B6-103,CHENGDU, 610000
CHENGDU SICHUAN 610000
CN
E0-23-3B (hex) Elvys s.r.o
100000-1FFFFF (base 16) Elvys s.r.o
Polska 9
Kosice 04011
SK
50-FA-CB (hex) Bosch Security Systems
900000-9FFFFF (base 16) Bosch Security Systems
Estrada Nacional 109/IC 1
Ovar Aveiro 3880-728
PT
00-6A-5E (hex) DICOM CORPORATION
600000-6FFFFF (base 16) DICOM CORPORATION
15TH FL, CENTER BUILDING, NO 1 NGUYEN HUY TUONG STR, THANH XUAN WARD
Hanoi 100000
VN
50-FA-CB (hex) Combined Public Communications, LLC
B00000-BFFFFF (base 16) Combined Public Communications, LLC
100 Aqua Drive
Cold Spring KY 41076
US
0C-7F-ED (hex) Tango Networks Inc
200000-2FFFFF (base 16) Tango Networks Inc
2601 Network Blvd, Suite 410
Frisco TX TX 75034
US
50-FA-CB (hex) todoc
000000-0FFFFF (base 16) todoc
501ho, 242 Digital-ro
Guro-gu Seoul 08394
KR
50-FA-CB (hex) 1208815047
600000-6FFFFF (base 16) 1208815047
5F, 547, SAMSEONG-RO, GANGNAM-GU,SEOUL, SOUTH KOREA
seoul 06156
KR
50-FA-CB (hex) Vortex Infotech Private Limited
D00000-DFFFFF (base 16) Vortex Infotech Private Limited
101, Corporate Arena, Sitaram Patkar Marg, Behind Mahindra Eminente Society, Goregaon west.
Mumbai Maharashtra 400104
IN
C8-5C-E2 (hex) Fela Management AG
000000-0FFFFF (base 16) Fela Management AG
@ -35699,18 +35843,6 @@ B00000-BFFFFF (base 16) Shenzhen C & D Electronics Co., Ltd.
ShenZhen GuangDong 518000
CN
E0-23-3B (hex) The KIE
400000-4FFFFF (base 16) The KIE
6F, 619, 42, Changeop-ro, Sujeong-gu, Seongnam-si
Gyeonggi-do 13449
KR
E0-23-3B (hex) HANET TECHNOLOGY
900000-9FFFFF (base 16) HANET TECHNOLOGY
13th Floor, G-Group Tower Building, No. 5 Nguyen Thi Due, Yen Hoa Ward
HANOI 70000
VN
48-08-EB (hex) Guangdong Three Link Technology Co., Ltd
200000-2FFFFF (base 16) Guangdong Three Link Technology Co., Ltd
3 floor, A1 Building, No. 75 Jianshe Road, Nankeng Village, Qishi Town
@ -35722,3 +35854,39 @@ E0-23-3B (hex) HANET TECHNOLOGY
3 javorova
Velka Lomnica Presov 05952
SK
E0-23-3B (hex) HANET TECHNOLOGY
900000-9FFFFF (base 16) HANET TECHNOLOGY
13th Floor, G-Group Tower Building, No. 5 Nguyen Thi Due, Yen Hoa Ward
HANOI 70000
VN
E0-23-3B (hex) The KIE
400000-4FFFFF (base 16) The KIE
6F, 619, 42, Changeop-ro, Sujeong-gu, Seongnam-si
Gyeonggi-do 13449
KR
50-FA-CB (hex) ZENOPIX TEKNOLOJI SAN VE TIC LTD STI
700000-7FFFFF (base 16) ZENOPIX TEKNOLOJI SAN VE TIC LTD STI
AKADEMI MAH. GURBULUT SK. S.U.TEKNOLOJI GELISTIRME BOLGESI KONYA TEKNOKENT NO:67 SELCUKLU
KONYA SELCUKLU 42060
TR
48-08-EB (hex) uniline energy systems pvt ltd
E00000-EFFFFF (base 16) uniline energy systems pvt ltd
198/23 Ramesh market,East of kailash
New Delhi Delhi 110065
IN
50-FA-CB (hex) Varex Imaging Finland
A00000-AFFFFF (base 16) Varex Imaging Finland
Tekniikantie 4
Espoo 02150
FI
9C-E4-50 (hex) AUO DISPLAY PLUS CORPORATION
A00000-AFFFFF (base 16) AUO DISPLAY PLUS CORPORATION
No. 1, Gongye E. 3rd Rd., East Dist., Hsinchu Science Park
Hsinchu Taiwan 30075
TW

View File

@ -7949,6 +7949,48 @@ F20000-F20FFF (base 16) Thermaco Incorporated
Graz 8054
AT
8C-1F-64 (hex) Omnilink Tecnologia S/A
023000-023FFF (base 16) Omnilink Tecnologia S/A
Alameda Tocantins, 350, Edificio West Corp, 13° andar, Alphaville Industrial
Barueri SP 06455-020
BR
8C-1F-64 (hex) GETQCALL
37A000-37AFFF (base 16) GETQCALL
23 Lorraine Drive
North York ON M2N6Z6
CA
8C-1F-64 (hex) Vinfast Trading and Production JSC
F80000-F80FFF (base 16) Vinfast Trading and Production JSC
Dinh Vu - Cat Hai Economic Zone, Cai Hai Island, Cat Hai Sepcial Administrative Zone
Hai Phong Hai Phong 180000
VN
8C-1F-64 (hex) YDIIT Co., Ltd.
1FA000-1FAFFF (base 16) YDIIT Co., Ltd.
#3010, U-Tower, 120, Heungdeokjungang-ro, Giheung-gu,
Yongin Gyeonggi 16950
KR
8C-1F-64 (hex) BEST
0A2000-0A2FFF (base 16) BEST
16, Deogyang-daero 1556beon-gil, Yeongtong-gu, , E-dong 1401ho, South Korea
수원 Gyeonggi-do 16690
KR
8C-1F-64 (hex) AUREKA SMART LIVING W.L.L
689000-689FFF (base 16) AUREKA SMART LIVING W.L.L
Office 22, Bldg 288C, Avenue 16, Hidd
Hidd 0111
BH
8C-1F-64 (hex) Embedded Designs Services India Pvt Ltd
CD7000-CD7FFF (base 16) Embedded Designs Services India Pvt Ltd
Unit No. 1119-20, 11th Floor, Tower 5, 12th Avenue, RPS Infinia, Faridabad, Haryana
Faridabad Haryana 121001
IN
8C-1F-64 (hex) Jacobs Technology, Inc.
A98000-A98FFF (base 16) Jacobs Technology, Inc.
7765 Old Telegraph Road
@ -15911,6 +15953,42 @@ D12000-D12FFF (base 16) QUANZHOU RADIOBOSS TECHNOLOGY CO., LTD
Taipei City 103606
TW
8C-1F-64 (hex) Foenix Coding Ltd
DA4000-DA4FFF (base 16) Foenix Coding Ltd
The Barns - Hilltop Farm Lyne Lane
Chertsey Surrey KT16 0AW
GB
8C-1F-64 (hex) Rail Telematics Corp
7C1000-7C1FFF (base 16) Rail Telematics Corp
494 6th Ave S
Jacksonville Beach 32250
US
8C-1F-64 (hex) Vigor Electric Corp.
A64000-A64FFF (base 16) Vigor Electric Corp.
No.116, Xingzhong Rd., Danshui Dist., New Taipei City 25152, Taiwan (R.O.C.)
Danshui Dist. New Taipei City 25152
TW
8C-1F-64 (hex) YUYAMA MFG Co.,Ltd
70A000-70AFFF (base 16) YUYAMA MFG Co.,Ltd
1-4-30
MEISHINGUCHI,TOYONAKA OSAKA 561-0841
JP
8C-1F-64 (hex) Sonic Italia
8D2000-8D2FFF (base 16) Sonic Italia
Viale A. De Gasperi 76
Rho Lombardia 20017
IT
8C-1F-64 (hex) HyperSilicon Co.,Ltd
E26000-E26FFF (base 16) HyperSilicon Co.,Ltd
Room A11-A12Yankuang Xinda Building,NO.66 Danshan RoadXishan Ditrict
Wuxi Jiangsu 214105
CN
8C-1F-64 (hex) Vision Systems Safety Tech
E6F000-E6FFFF (base 16) Vision Systems Safety Tech
5 Chemin de Chiradie
@ -23927,6 +24005,48 @@ A2F000-A2FFFF (base 16) AMC Europe Kft.
GuangZhou GuangDong 51000
CN
8C-1F-64 (hex) Bots Unlimited LLC
69D000-69DFFF (base 16) Bots Unlimited LLC
5817 La Colonia
San Antonio TX 78218
US
8C-1F-64 (hex) Potter Electric Signal Co. LLC
690000-690FFF (base 16) Potter Electric Signal Co. LLC
1609 Park 370 Place
Hazelwood MO 63042
US
8C-1F-64 (hex) HARBIN DIGITAL ECONOMY DEVELOPMENT CO.,LTD
EC2000-EC2FFF (base 16) HARBIN DIGITAL ECONOMY DEVELOPMENT CO.,LTD
No. 22, Binhe Avenue, Pingfang District
Harbin Heilongjiang 150060
CN
8C-1F-64 (hex) Combined Public Communications, LLC
6E8000-6E8FFF (base 16) Combined Public Communications, LLC
100 Aqua Drive
Cold Spring KY 41076
US
8C-1F-64 (hex) Image Soft Oy
843000-843FFF (base 16) Image Soft Oy
Valimotie 13A
HELSINKI 00380
FI
8C-1F-64 (hex) DEUTA Werke GmbH
546000-546FFF (base 16) DEUTA Werke GmbH
ET
Bergisch Gladbach NRW 51465
DE
8C-1F-64 (hex) Salience Labs
078000-078FFF (base 16) Salience Labs
100 Park Drive
Abingdon-on-Thames Oxfordshire OX14 4RY
GB
8C-1F-64 (hex) Flow Power
82B000-82BFFF (base 16) Flow Power
Suite 2, Level 3, 18 - 20 York St
@ -31913,6 +32033,30 @@ F54000-F54FFF (base 16) Rowan Tools Office
Hamamatsu Shizuoka 4300918
JP
8C-1F-64 (hex) RADA Electronics Industries Ltd.
B35000-B35FFF (base 16) RADA Electronics Industries Ltd.
7 Gibory Israel St.
Netanya 42504
IL
8C-1F-64 (hex) MB connect line GmbH
46D000-46DFFF (base 16) MB connect line GmbH
Winnettener Strasse 6
Dinkelsbuehl Bavaria 91550
DE
8C-1F-64 (hex) Intellicon Private Limited
BF7000-BF7FFF (base 16) Intellicon Private Limited
Plot No. E-14,14/1,15,15/1,16,16/1/2,16/1/3,Sector - 26, GIDC Electronic Zone,Gandhinagar-382028, India
Gandhinagar Gujarat 382028
IN
8C-1F-64 (hex) Nihon Bouhan Camera Inc
9A7000-9A7FFF (base 16) Nihon Bouhan Camera Inc
7F Daiichikosam Bldg ,3-14-10,Ginza
Chuou-ku Tokyo 104-0061
JP
8C-1F-64 (hex) Mobileye
D63000-D63FFF (base 16) Mobileye
13 Hartom st.
@ -39772,3 +39916,33 @@ FC6000-FC6FFF (base 16) Invertek Drives Ltd
7, Geombae-ro404, 4F
Guri-si 11929
KR
8C-1F-64 (hex) MOIZ
37C000-37CFFF (base 16) MOIZ
25 Avenue des Martyrsc/o Institut Neel Bat E - BP166
Grenoble Cedex 9 38042
FR
8C-1F-64 (hex) METABUILD
E36000-E36FFF (base 16) METABUILD
62, Seochojungang-ro
Seocho-gu Seoul KS013
KR
8C-1F-64 (hex) Realtek Semiconductor Corp.
D5A000-D5AFFF (base 16) Realtek Semiconductor Corp.
No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300
Taiwan Guangdong 300
CN
8C-1F-64 (hex) LUNEAU TECHNOLOGY OPERATIONS
C6F000-C6FFFF (base 16) LUNEAU TECHNOLOGY OPERATIONS
2, rue Roger Bonnet
Pont De L'Arche France 27340
FR
8C-1F-64 (hex) JISEONGENG Co,.LTD
0E3000-0E3FFF (base 16) JISEONGENG Co,.LTD
80 Seungsamsin-ri-gil, Yonggang-dong, Gyeongju-si, Gyeongsangbuk-do
Gyeongju city 38090
KR

View File

@ -1 +1 @@
258~rc3
258~rc4

View File

@ -56,6 +56,7 @@ Packages=
kmod
knot
libapparmor1
libcap-progs
multipath-tools
ncat
open-iscsi

View File

@ -10,6 +10,7 @@ Packages=
grep
hostname
iproute2
libcap-progs
ncat
patterns-base-minimal_base
sed

View File

@ -43,11 +43,6 @@
#include "time-util.h"
#include "utf8.h"
#define ANSI_RESET_CURSOR \
"\033?25h" /* turn on cursor */ \
"\033?12l" /* reset cursor blinking */ \
"\033 1q" /* reset cursor style */
/* How much to wait for a reply to a terminal sequence */
#define CONSOLE_REPLY_WAIT_USEC (333 * USEC_PER_MSEC)
@ -857,7 +852,6 @@ int vt_disallocate(const char *tty_path) {
return fd2;
return loop_write_full(fd2,
ANSI_RESET_CURSOR
"\033[r" /* clear scrolling region */
"\033[H" /* move home */
"\033[3J" /* clear screen including scrollback, requires Linux 2.6.40 */
@ -974,7 +968,6 @@ static int terminal_reset_ansi_seq(int fd) {
return log_debug_errno(r, "Failed to set terminal to non-blocking mode: %m");
k = loop_write_full(fd,
ANSI_RESET_CURSOR
"\033[!p" /* soft terminal reset */
"\033]104\007" /* reset colors */
"\033[?7h" /* enable line-wrapping */

View File

@ -19,6 +19,7 @@
#include "fstab-util.h"
#include "generator.h"
#include "gpt.h"
#include "hexdecoct.h"
#include "image-policy.h"
#include "initrd-util.h"
#include "loop-util.h"
@ -46,6 +47,7 @@ static const char *arg_dest_late = NULL;
static bool arg_enabled = true;
static GptAutoRoot arg_auto_root = _GPT_AUTO_ROOT_INVALID;
static GptAutoRoot arg_auto_usr = _GPT_AUTO_ROOT_INVALID;
static VeritySettings arg_verity_settings = VERITY_SETTINGS_DEFAULT;
static bool arg_swap_enabled = true;
static char *arg_root_fstype = NULL;
static char *arg_root_options = NULL;
@ -1063,15 +1065,6 @@ static int enumerate_partitions(dev_t devnum) {
_cleanup_free_ char *devname = NULL;
int r;
static const PartitionDesignator ignore_designators[] = {
PARTITION_ROOT,
PARTITION_ROOT_VERITY,
PARTITION_ROOT_VERITY_SIG,
PARTITION_USR,
PARTITION_USR_VERITY,
PARTITION_USR_VERITY_SIG,
};
assert(!in_initrd());
/* Run on the final root fs (not in the initrd), to mount auxiliary partitions, and hook in rw
@ -1087,14 +1080,6 @@ static int enumerate_partitions(dev_t devnum) {
return log_debug_errno(r, "Failed to get device node of " DEVNUM_FORMAT_STR ": %m",
DEVNUM_FORMAT_VAL(devnum));
_cleanup_(image_policy_freep) ImagePolicy *image_policy = NULL;
r = image_policy_ignore_designators(
arg_image_policy ?: &image_policy_host,
ignore_designators, ELEMENTSOF(ignore_designators),
&image_policy);
if (r < 0)
return log_debug_errno(r, "Failed to mark root/usr designators as ignore in image policy: %m");
/* Let's take a LOCK_SH lock on the block device, in case udevd is already running. If we don't take
* the lock, udevd might end up issuing BLKRRPART in the middle, and we don't want that, since that
* might remove all partitions while we are operating on them. */
@ -1104,9 +1089,9 @@ static int enumerate_partitions(dev_t devnum) {
r = dissect_loop_device(
loop,
/* verity= */ NULL,
&arg_verity_settings,
/* mount_options= */ NULL,
image_policy,
arg_image_policy ?: &image_policy_host,
arg_image_filter,
DISSECT_IMAGE_GPT_ONLY|
DISSECT_IMAGE_USR_NO_ROOT|
@ -1204,6 +1189,25 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
arg_auto_root = GPT_AUTO_ROOT_OFF;
log_debug("Disabling root partition auto-detection, roothash= is set.");
arg_verity_settings.designator = PARTITION_ROOT;
free(arg_verity_settings.root_hash);
r = unhexmem(value, &arg_verity_settings.root_hash, &arg_verity_settings.root_hash_size);
if (r < 0)
return log_error_errno(r, "Failed to parse roothash= from kernel command line: %m");
} else if (streq(key, "usrhash")) {
if (proc_cmdline_value_missing(key, value))
return 0;
arg_verity_settings.designator = PARTITION_USR;
free(arg_verity_settings.root_hash);
r = unhexmem(value, &arg_verity_settings.root_hash, &arg_verity_settings.root_hash_size);
if (r < 0)
return log_error_errno(r, "Failed to parse usrhash= from kernel command line: %m");
} else if (streq(key, "rootfstype")) {
if (proc_cmdline_value_missing(key, value))

View File

@ -5950,7 +5950,7 @@ static int run(int argc, char *argv[]) {
/* If we're not unsharing the network namespace and are unsharing the user namespace, we won't have
* permissions to bind ports in the container, so let's drop the CAP_NET_BIND_SERVICE capability to
* indicate that. */
if (!arg_private_network && arg_userns_mode != USER_NAMESPACE_NO && arg_uid_shift > 0)
if (!arg_private_network && arg_userns_mode != USER_NAMESPACE_NO)
arg_caps_retain &= ~(UINT64_C(1) << CAP_NET_BIND_SERVICE);
r = verify_arguments();

View File

@ -1446,7 +1446,7 @@ testcase_unpriv_dir() {
rm -rf "$root"
}
testcase_link_journa_hostl() {
testcase_link_journal_host() {
local root hoge i
root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.link-journal.XXX)"
@ -1470,4 +1470,22 @@ testcase_link_journa_hostl() {
rm -fr "$root"
}
testcase_cap_net_bind_service() {
local root
root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.cap-net-bind-service.XXX)"
create_dummy_container "$root"
# Check that CAP_NET_BIND_SERVICE is available without --private-users
systemd-nspawn --register=no --directory="$root" capsh --has-p=cap_net_bind_service
# Check that CAP_NET_BIND_SERVICE is not available with --private-users=identity
(! systemd-nspawn --register=no --directory="$root" --private-users=identity capsh --has-p=cap_net_bind_service)
# Check that CAP_NET_BIND_SERVICE is not available with --private-users=pick
(! systemd-nspawn --register=no --directory="$root" --private-users=pick capsh --has-p=cap_net_bind_service)
rm -fr "$root"
}
run_testcases

View File

@ -4,7 +4,7 @@ set -eux
set -o pipefail
# check dfuzzer is present before testing
if ! command -v dfuzzer &>/dev/null; then
if ! command -v dfuzzer >/dev/null; then
echo "dfuzzer is not installed, skipping" | tee --append /skipped
exit 77
fi

View File

@ -537,7 +537,7 @@ for opt in json multiplexer output synthesize with-dropin with-nss with-varlink;
done
# FIXME: sshd seems to crash inside asan currently, skip the actual ssh test hence
if command -v ssh &>/dev/null && command -v sshd &>/dev/null && ! [[ -v ASAN_OPTIONS ]]; then
if command -v ssh >/dev/null && command -v sshd >/dev/null && ! [[ -v ASAN_OPTIONS ]]; then
at_exit() {
set +e

View File

@ -9,7 +9,7 @@ mount -t ddi "$MINIMAL_IMAGE.gpt" "$dir" -o ro,X-mount.mkdir,discard
umount -R "$dir"
# Test systemd-repart --make-ddi=:
if [[ -z "${OPENSSL_CONFIG:?}" ]] || ! command -v mksquashfs &>/dev/null; then
if [[ -z "${OPENSSL_CONFIG:?}" ]] || ! command -v mksquashfs >/dev/null; then
echo "Skipping --make-ddi= tests"
exit 0
fi

View File

@ -771,6 +771,8 @@ rm -rf "$VDIR" "$VDIR2" /tmp/vpickminimg /tmp/markers/
# Test that an extension consisting of an empty directory under /etc/extensions/ takes precedence
mkdir -p /var/lib/extensions/
ln -s /tmp/app-nodistro.raw /var/lib/extensions/app-nodistro.raw
systemd-sysext status
systemd-sysext list
systemd-sysext merge
grep -q -F "MARKER=1" /usr/lib/systemd/system/some_file
systemd-sysext unmerge

View File

@ -3,7 +3,7 @@
set -eux
set -o pipefail
if ! command -v ssh &> /dev/null || ! command -v sshd &> /dev/null ; then
if ! command -v ssh >/dev/null || ! command -v sshd >/dev/null ; then
echo "ssh/sshd not found, skipping test." >&2
exit 0
fi
@ -62,7 +62,7 @@ modprobe vsock_loopback ||:
if test -e /dev/vsock -a -d /sys/module/vsock_loopback ; then
ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" vsock/1 cat /etc/machine-id | cmp - /etc/machine-id
if ! command -v scp &> /dev/null ; then
if ! command -v scp >/dev/null ; then
echo "scp not found, skipping subtest" >&2
else
OUT_FILE=$(mktemp -u)