From d4a3a5d167ee72008aff77608e6cc3c4fa3888a6 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
Date: Tue, 4 Mar 2025 19:01:14 +0000
Subject: [PATCH] Merge /usr/sbin

---
 wolfi-baselayout.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wolfi-baselayout.yaml b/wolfi-baselayout.yaml
index 695237f16c2..98df97e32ba 100644
--- a/wolfi-baselayout.yaml
+++ b/wolfi-baselayout.yaml
@@ -1,7 +1,7 @@
 package:
   name: wolfi-baselayout
   version: 20230201
-  epoch: 18
+  epoch: 19
   description: "baselayout data for Wolfi"
   copyright:
     - license: MIT
@@ -11,7 +11,7 @@ package:
     provides:
       - merged-sbin
       - merged-bin
-      #- merged-usrsbin
+      - merged-usrsbin
       #- merged-lib
 
 environment:
@@ -50,13 +50,13 @@ pipeline:
       # split-usr
       # mkdir -p ${{targets.destdir}}/sbin
       # mkdir -p ${{targets.destdir}}/bin
-      mkdir -p ${{targets.destdir}}/usr/sbin
+      # mkdir -p ${{targets.destdir}}/usr/sbin
       mkdir -p ${{targets.destdir}}/lib
 
       # usr-merge
       ln -s usr/bin ${{targets.destdir}}/sbin
       ln -s usr/bin ${{targets.destdir}}/bin
-      # ln -s bin ${{targets.destdir}}/usr/sbin
+      ln -s bin ${{targets.destdir}}/usr/sbin
       # ln -s usr/lib ${{targets.destdir}}/usr/lib
 
       for i in lib64 usr/lib64 usr/local/lib64; do