diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-07-30 12:56:15 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-07-30 12:56:43 -0400 |
| commit | 6e488d5ae2d8226c30fbc07ca6813cfbcad694cb (patch) | |
| tree | 8ade17468e9e264a68a63b387b14d13d966aa45c /manifest | |
| parent | 60e0b1e68024bd838c98cd2f6a75875b11655ca7 (diff) | |
| parent | d48f713ac62c289b9e5d2c48645e62f4e644fe2a (diff) | |
| download | illumos-joyent-6e488d5ae2d8226c30fbc07ca6813cfbcad694cb.tar.gz | |
[illumos-gate merge]
commit d48f713ac62c289b9e5d2c48645e62f4e644fe2a
13966 strong IP hostmodel breaks DHCP
commit 5dfe3bc3a91b2e1069f643e17f6213f089f5979b
13974 gptzfsboot: fall back device name is always disk-1:
commit 6d317d2f8bc347904716264ebe052812c3fc217a
13980 filelists: SPARC boot archive update is missing file updates
commit 6963446fe0c14e57937622dbef439717f823d078
13970 loader: BIOS loader ld script needs to use KEEP statement with linker sets
commit 418edcfa14b4e9bcad9cb7f5a2c78470c516b626
13979 support FTDI FT232H serial interface
commit ca706442e611a88ef5cbcd5deab686390a75263b
13907 diskinfo fails and exits on the first bad disk
commit 35fa020436971e0d663866b134eff23b6f45d32c
13863 want 64bit libipadm
Conflicts:
manifest
usr/src/uts/intel/os/driver_aliases
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1307,6 +1307,8 @@ f lib/amd64/libinetutil.so.1 0755 root bin s lib/amd64/libinetutil.so=libinetutil.so.1 f lib/amd64/libintl.so.1 0755 root bin s lib/amd64/libintl.so=libintl.so.1 +f lib/amd64/libipadm.so.1 0755 root bin +s lib/amd64/libipadm.so=libipadm.so.1 f lib/amd64/libkmf.so.1 0755 root bin s lib/amd64/libkmf.so=libkmf.so.1 f lib/amd64/libkmfberder.so.1 0755 root bin @@ -5301,6 +5303,8 @@ s usr/lib/amd64/libinetutil.so.1=../../../lib/amd64/libinetutil.so.1 s usr/lib/amd64/libinetutil.so=../../../lib/amd64/libinetutil.so.1 s usr/lib/amd64/libintl.so.1=../../../lib/amd64/libintl.so.1 s usr/lib/amd64/libintl.so=../../../lib/amd64/libintl.so.1 +s usr/lib/amd64/libipadm.so.1=../../lib/amd64/libipadm.so.1 +s usr/lib/amd64/libipadm.so=../../lib/amd64/libipadm.so.1 f usr/lib/amd64/libipd.so.1 0755 root bin s usr/lib/amd64/libipd.so=libipd.so.1 f usr/lib/amd64/libipmi.so.1 0755 root bin |